From 4a8e46e5254dff0f82d7dc92f0985c036902e6d1 Mon Sep 17 00:00:00 2001 From: Hy Date: Tue, 15 Jun 2021 19:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArcFace64.dat | 2 +- .../controller/EncodingRulesController.java | 62 ++++++++ .../mapper/EncodingRulesMapper.java | 11 ++ .../service/IEncodingRulesService.java | 10 ++ .../impl/EncodingRulesServiceImpl.java | 17 +++ .../controller/JobManageController.java | 5 + .../demo/kitreader/encoding/Cmd_82.java | 4 + .../controller/ToolAdminController.java | 4 + .../demo/tooladmin/entity/ToolAdmin.java | 12 +- .../tooladmin/mapper/ToolAdminMapper.java | 11 ++ .../tooladmin/mapper/xml/ToolAdminMapper.xml | 9 ++ .../tooladmin/service/IToolAdminService.java | 11 ++ .../service/impl/ToolAdminServiceImpl.java | 20 +++ .../src/test/java/org/jeecg/Test.java | 140 ++++++++++++++---- 14 files changed, 287 insertions(+), 31 deletions(-) diff --git a/ArcFace64.dat b/ArcFace64.dat index bc8b070..707a747 100644 --- a/ArcFace64.dat +++ b/ArcFace64.dat @@ -1 +1 @@ -EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTIMJAIEGOGJDZBICODPGFBFGCEFHIDIINFTEKHBGYCNCHEKCVANHRAMAVDSIHDYGAJIGBFKAZCPGVEYJTIZEZJRHMDVFAHRBZCAJQCLJGJFIBJHCJFMHEIXDWAVBVIWFOFGBBGHCGEKEJJAAXDJJBJEFTASHUEHIDIBDBAUJSDOGJFTHQBAEAFFJGCMGIHWITEBJVJJBGDIHVGUJJEDFUCRIRAMBNCXHJCLHZDNCJGYBVIWAAEAHQFQGAFUIBELCOBQFCFXGPJQCCAFGQDVJGBWIUGKGGFUGAGXEYCJBFGVFDHZCUIMFCFYFBEYBABQHGDCIKDRHDDVFWCRHKILGGITCAIKIFIIBSBPBOCRIJGFFFHXHOEWJHBYDHGNIGCAFWBMHCBNIVEXJIFEICAQCICJCSDGGIEEJIEBFJHLEPGBJHCNDCJDERCLGYJLAECBIIGCFFJPGJEQJDCNFWHOIXCUJGBLHRHJHDDTILALGZGJIVGOITGXELGBHDDECAHVAEGIFRBNEYAADWCCERDEDQEDFCBJEIDNAJCPHHITDZEDDGBXBLEAICGOENAVCLJDHJFRIZEGBAEHDYFOFPBJIBAQIFAHEGAMCCEBGWGPEJDZGLGVCQGLHWHEJVDMBJDRJQJOCGIUJQACABGXFPGFFHGKCNHZINAMBCBWDSJHDRFRFDCBDMGNHGDPFKDSENBAHOFUIFAGIJHGANBDHVCQAGJHGVAZEXGDECIDBZEJBQCFAJIVJHHMFODKDYEBFDHPGYCEHUIHIZCFFBEUEUDIIMBHJVDXEIGQFKILBOHTBAFLHHJACDANJIJLAMHTHLJKEXIMESJTIIDUFMJHHSCYAGHLIYGJHWAUEBFHBCGDBEJHIGFPDGEOBQHKFMFCDXEWAKHHDHCHHHHACDJCBMHOCSHUADIOBHDUCHFTIYGJGICQHPGSFUHOHGENFKHXGLAAFRFKCVCMBIFCFHCWHQDUEGHRDOGOHPGTGSHJFVCAAJHFEWIOIOAAAJFGGLEHIYCNCABHJABYAVACCNACFADDCLESEFIDCJGFEZAGIPCECXGBIZEEJHILBVAUJEAMDXASJJDLDKBEHIEXEDAYDLJCIIFXBVBRCNECJT \ No newline at end of file +EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTIMJAIEGOGJDZBICODPGFBFGCEFHIDIINFTEKHBGYCNCHEKCVANHRAMAVDSIHDYGAJIGBFKAZCPGVEYJTIZEZJRHMDVFAHRBZCAJQCLJGJFIBJHCJFMHEIXDWAVBVIWFOFGBBGHCGEKEJJAAXDJJBJEFTASHUEHIDIBDBAUJSDOGJFTHQBAEAFFJGCMGIHWITEBJVJJBGDIHVGUJJEDFUCRIRAMBNCXHJCLHZDNCJGYBVIWAAEAHQFQGAFUIBELCOBQFCFXGPJQCCAFGQDVJGBWIUGKGGFUGAGXEYCJBFGVFDHZCUIMFCFYFBEYBABQHGDCIKDRHDDVFWCRHKILGGITCAIKIFIIBSBPBOCRIJGFFFHXHOEWJHBYDHGNIGCAFWBMHCBNIVEXJIFEICAQCICJCSDGGIEEJIEBFJHLEPHECTGAGOEBBZIKIVBZEBEIFUBFHRJPFRATJUJBFAISCODEGICLAMGMASABCADPFGATFDDTJHFXHFBVDUGHAWBPBTDFDLFHJEAZGVIOCIIVBCCEFKEOFGDWJGHJBNALEBIIABDEFHGKHIGJGIGKHKATITJTDJJMAKEJAQEAISBLDSFJEVAHGXEMAEHPDAGMHDJKECHCGCARCUFSJMFDBVEHGXCCETIVJNAUBVFLAXHJAACXDUCYGZGZFGIHIPCMCPAQEFEIBOGIBQBMDPDQDNANBIGVJCHXCAFFEXGOCVHBGEBEICDYJRIXFFGKBOBGEVAGAICXCGBGAGEKFNILGQDXFVERBABXFKAMDZEGBLJLHRJRARFYGQEREUJCFKECJFANFKBVJMBQCMEFJOIGFIDTGSHHBICRCGCXDJBHIGGZBFIXHFBKERCHESBKBMCDCMEZBMBXFEBRABHQHGEVBUDAIFFDIHHUIFBLDVHIHWGOFOCEIOANBKFVHPDVJABLEYIRATHVDQFXAPHDHMDPJRBKBJABAEEWJREQBPCBFXEVBNELARERHFEXFOJOFXIQAZILDIJJAPAIFOJUHSCADTDNIRGZHJASAYBWDTFFICGLEQEOIAHQHMIQDHBIHYDWEEBECQHKFUDYIQEDBAAHEOFLCYCBFQARFLCDADBJHHBUDFGLIEEODWEHJE \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java index d8c084f..1837b79 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.encodingrules.controller; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,6 +10,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.DecodeUtil; @@ -82,6 +85,65 @@ public class EncodingRulesController extends JeecgController encodingValue = encodingRulesService.getEncodingValue(encoding); return encodingValue; } + + @AutoLog(value = "标签-解码") + @ApiOperation(value="标签-解码", notes="标签-解码") + @PostMapping(value = "/encodingTags") + public Map encodingTags(@RequestBody JSONObject jsonObject) { + String str = jsonObject.getString("tags"); + int j = 1; + String newStr = ""; + String value = ""; + for (int i=str.length()-1;i>=0;i--){ + System.out.println("du = " + str); + if (str.length() != 0){ + if (j!=6) { + newStr = str.substring(0,2); + str = str.substring(2); + if (j < 10) { + value += encodingRulesService.encodingValue("0" + j, "0" + j + "_" + newStr).getEncodingValue() + ","; + } else { + value += encodingRulesService.encodingValue(String.valueOf(j), String.valueOf(j) + "_" + newStr).getEncodingValue() + ","; + } + } + + System.out.println("第" + i + "次截取结果=" + newStr); + if (j==6){ + newStr = str.substring(0,5); + str = str.substring(5); + if (j<10){ + value += encodingRulesService.encodingValue("0" + j,"0" + j + "_" + newStr).getEncodingValue() + ","; + }else { + value += encodingRulesService.encodingValue(String.valueOf(j),String.valueOf(j) + "_" + newStr).getEncodingValue() + ","; + } + System.out.println("第" + i + "次截取结果=" + newStr); + } + + }else { + break; + } + j++; + } + Map map = new HashMap(); + String[] res = value.substring(0,value.length()-1).split(","); + for (int i = 0;i { @Select("select encoding_type,encoding_value from encoding_rules where find_in_set(encoding_key,#{encoding})") List getEncodingValue(@Param("encoding") String encoding); + /** + * @description: 解析数据 + * @param type 类型 + * @param key 键 + * @return: org.jeecg.modules.demo.encodingrules.entity.EncodingRules + * @author huangyu + * @date: 2021/6/15 18:11 + */ + @Select("select * from encoding_rules where encoding_type = #{type} and encoding_key = #{key}") + EncodingRules encodingValue(String type,String key); + } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/IEncodingRulesService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/IEncodingRulesService.java index de7e409..5e6f29f 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/IEncodingRulesService.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/IEncodingRulesService.java @@ -23,4 +23,14 @@ public interface IEncodingRulesService extends IService { */ List getEncodingValue(String encoding); + /** + * @description: 解析数据 + * @param type 类型 + * @param key 键 + * @return: org.jeecg.modules.demo.encodingrules.entity.EncodingRules + * @author huangyu + * @date: 2021/6/15 18:11 + */ + EncodingRules encodingValue(String type,String key); + } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/impl/EncodingRulesServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/impl/EncodingRulesServiceImpl.java index de85685..5cc6dee 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/impl/EncodingRulesServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/service/impl/EncodingRulesServiceImpl.java @@ -43,4 +43,21 @@ public class EncodingRulesServiceImpl extends ServiceImpl importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ToolAdmin.class); } + + public void encodingTool(){ + + } } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/entity/ToolAdmin.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/entity/ToolAdmin.java index 9051891..67f7a26 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/entity/ToolAdmin.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/entity/ToolAdmin.java @@ -71,8 +71,12 @@ public class ToolAdmin implements Serializable { @Excel(name = "其他", width = 15) @ApiModelProperty(value = "其他") private java.lang.String other; - /**其他*/ -// @Excel(name = "数量", width = 15) -// @ApiModelProperty(value = "其他") -// private java.lang.String toolNum; + /**工具箱编号*/ + @Excel(name = "工具箱编号", width = 15) + @ApiModelProperty(value = "工具箱编号") + private java.lang.String toolboxNum; + /**工具标签*/ + @Excel(name = "工具标签", width = 15) + @ApiModelProperty(value = "工具标签") + private java.lang.String toolNum; } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java index 824d3b9..09da14d 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.tooladmin.mapper; +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Insert; @@ -28,4 +29,14 @@ public interface ToolAdminMapper extends BaseMapper { @Select("select id from sys_dict_item where item_value = #{itemValue}") List CategoryCheckDuplicate(@Param("sysDictItem")String itemValue); + + /** + * @description: 批量插入 + * @param list 数据 + * @param toolboxNum 工具箱编号 + * @return: java.lang.Integer + * @author huangyu + * @date: 2021/6/15 15:37 + */ + Integer saveList(@Param("list") List list,@Param("toolboxNum") String toolboxNum,@Param("username") String username,@Param("createDate") Date createDate); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/xml/ToolAdminMapper.xml b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/xml/ToolAdminMapper.xml index 4c41307..c02d40d 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/xml/ToolAdminMapper.xml +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/xml/ToolAdminMapper.xml @@ -2,4 +2,13 @@ + + insert into tool_admin (id,tool_num,toolbox_num,create_by,create_time) values + + ( + UUID(),#{item},#{toolboxNum},#{username},#{createDate} + ) + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java index 5682f3c..c26527c 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java @@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.demo.tooladmin.entity.ToolAdmin; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; import java.util.List; /** @@ -22,4 +23,14 @@ public interface IToolAdminService extends IService { List checkDuplicate(String toolName,String toolCode,String toolSpecifications); List CategoryCheckDuplicate(String itemValue); + + /** + * @description: 批量插入 + * @param list 数据 + * @param toolboxNum 工具箱编号 + * @return: java.lang.Integer + * @author huangyu + * @date: 2021/6/15 15:37 + */ + Integer saveList(List list, String toolboxNum, String username, Date createDate); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java index 4b5f454..42cf1cc 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java @@ -8,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -76,4 +78,22 @@ public class ToolAdminServiceImpl extends ServiceImpl stringStringMap = InspectionInfor.encodingInspectionInfo(); - System.out.println("stringStringMap.get(\"D06\") = " + stringStringMap.get("D06")); +// System.out.println("Byte.parseByte(1) " + Byte.parseByte("1")); +// +// Map stringStringMap = InspectionInfor.encodingInspectionInfo(); +// System.out.println("stringStringMap.get(\"D06\") = " + stringStringMap.get("D06")); +// List list = new ArrayList<>(); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// list.add("05-00-00-00-00-00-00-00-00-00-00-00"); +// QueryWrapper wrapper = new QueryWrapper(); +// wrapper.eq("toolbox_num","5895647"); +// toolAdminService.remove(wrapper); +// toolAdminService.saveList(list,"5895647","admin",new Date()); +// String str = "020000000000-1F000000001205"; +// int j = 1; +// String newStr = ""; +// String value = ""; +// for (int i=str.length()-1;i>=0;i--){ +// System.out.println("du = " + str); +// if (str.length() != 0){ +// if (j!=6) { +// newStr = str.substring(0,2); +// str = str.substring(2); +// if (j < 10) { +// value += encodingRulesService.encodingValue("0" + j, "0" + j + "_" + newStr).getEncodingValue() + ","; +// } else { +// value += encodingRulesService.encodingValue(String.valueOf(j), String.valueOf(j) + "_" + newStr).getEncodingValue() + ","; +// } +// } +// +// System.out.println("第" + i + "次截取结果=" + newStr); +// if (j==6){ +// newStr = str.substring(0,5); +// str = str.substring(5); +// if (j<10){ +// value += encodingRulesService.encodingValue("0" + j,"0" + j + "_" + newStr).getEncodingValue() + ","; +// }else { +// value += encodingRulesService.encodingValue(String.valueOf(j),String.valueOf(j) + "_" + newStr).getEncodingValue() + ","; +// } +// System.out.println("第" + i + "次截取结果=" + newStr); +// } +// +// }else { +// break; +// } +// j++; +// } +// System.out.println("value = " + value); +// Map stringStringMap = encodingRulesController.encodingTags("020000000000-1F000000001205"); +// for (String res : stringStringMap.values()){ +// System.out.println("res = " + res); +// } } } -- Gitee