人脸识别dll更换和bug修改

ArcFace64.dat

@@ -1 +1 @@
-EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEAYJVHCBNCPHOFUJNGGJFFREZFAAKGEGQCQHDBZBWENDKCGHTFXCXAIEHGWEPFOGYFIFSHOCRJCBOHDDLDCCAJGBGAPCXDMHMAYAHBFHNCYJTEHENIJEBDNBPFLBDBUGADIGTEWEAHEEGHGJBDXEEJMBLAKHYJHBPEKBEHHHQDECQEMGEFRCIHLIVGXBXFQBTJECKEPCSDRGPFLAZADHCENEJCQJIHPDNJTCBDXCCAFEFGIJNEBBIHSFFFMEEDADRCHFKEXHNEIAFHAAGHAJQCTGDGVFOIYBRJEJVEUJJDOEIJCIQBMCUASHBIVHNDADKALISDXFADZICEJCPASDRGSERDWHXIGAYBJFVELGJGXEHDQJTHYBXHVHNIAIWIOIJGRCBAXAIIHFJGGAHGDAPAHCHHHJHETHBBDIUJOJBCVIMJLEKDJIUBDHHBRAEGMEBBUHKHKCABLHQARARFTFRCZGTEGANJTBGJTFTCJGXHDHXEHEGBMGDABADDCAFABHKFRAWDQJAEFCNGMCTBWADCGCUACALIAHFDEAEJUESGFCTFAHZFOFKHSILFFIHJLAWHEFMFJFKBODTCDJGEPBXHQHYBSHWBADOJCIAHLJJCUBYFLHPDMJTJGJVFZEEDKIMGJHUBTJDATAKFICECEBMHBIKJQCTFDEZFBAHJNFLJGIKAJCGDOIHJSEE
+EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEBBBYBUERFXCYIOHWAOHQBVDFJGCEFZFHAUJGJNJGAPDRJMESBAFHGACOCDDHCOCCEXDDDVDRAVDEHOGBBRANCXEJFVBIABDLDOAVCQBICYCDIBAXJRBQGVDFHQAKDYEDHRHVAGGUJHIAHSFIFUCIDCBRHZDOASDAIDHCJNDEJCFDHIBCFLCQBYFWGNFKAIJQFKFBAPEBGMDOBXGGCAIUENJHDRATFCHIGBCCGZBDJLHQFSHDINHJEVIJESEWANJFEQIVBAILJLBACPHNCHEMAYHJGBAOHLCTGAGLFWBQHFFPEKBYHDEUAOBAABJSBNFFINFDAAGUJTAVBVDHDTEEFNBSJKJNCODGHEECIRGXARCCFZFBFMDJCDGREDCNFOAWEPFIFCGWEBBZHPFVHDBUHFCHFDACJCGSARHMCMBMDDCRCWHBAZJBHHJMDKFWBKFQIHAFADBLGFCSJBEWFAJLGVGPBNANFPINAHIRIJEYJRFWDPCDCSBEGHHTGMATCWEYGQHGAHEJIEHQDZEHCRIRGLJHDABFJKDKBPGUJFJICIGVHRIZHXDWADHMDTABAXCGJIBLHIBYDJELBYBJIFJNDCCICIJDELBOJBJEBRFZDCBUHXGDBKCVBGGQHUFUJIIYHFAAIBBDCEAYDLFHBDBJCADMDFCDGMAYHLHDBGDSCHCECOEAEYJOIFHZ

pom.xml

@@ -725,7 +725,7 @@
         <dependency>
             <groupId>net.sf.mpxj</groupId>
             <artifactId>mpxj</artifactId>
-            <version>8.3.3</version>
+            <version>10.11.0</version>
         </dependency>
     </dependencies>
 

src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml

@@ -11,7 +11,7 @@
         </if>
         <if test="param.startTime!=null and param.startTime!=''">
             AND a.start_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
-        </if>z
+        </if>
         <if test="param.endTime!=null and param.endTime!=''">
             AND a.end_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
         </if>

src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml

@@ -34,6 +34,6 @@
         <if test="param.endTime!=null and param.endTime!=''">
             and a.upload_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
         </if>
-
+        ORDER BY a.upload_time DESC
     </select>
 </mapper>

src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # \u73AF\u5883\u9009\u62E9
-spring.profiles.active=dev
+spring.profiles.active=zjsj
 #spring.profiles.active=dev6024
 #spring.profiles.active=dev6025
 #spring.profiles.active=hncs