fix：“优化订单查询接口"

src/main/java/com/szwl/controller/TNameDictionaryController.java

@@ -34,13 +34,12 @@ public class TNameDictionaryController {
     private TNameDictionaryService nameDictionaryService;
 
     @GetMapping("/save")
-    public String save(String nameStr, String lan) {
+    public String save(String nameStr, String lan, String machineType) {
         String xmlString =
                 "<root>"
                         + nameStr
                         + "</root>";
-        String[] noStr = {"A49", "A50", "A51", "A52", "A53", "A54", "A55", "A56", "A57",
-                "A58", "A59", "A60", "A61", "A62", "A63", "A64", "A65", "A66"};
+        String[] noStr = {"B01", "B02", "B03", "B04", "B05", "B06"};
         List<String> str = new ArrayList<>();
         try{
             SAXReader reader = new SAXReader();
@@ -67,6 +66,7 @@ public class TNameDictionaryController {
             nameDictionary.setName(s);
             nameDictionary.setNo(noStr[i]);
             nameDictionary.setLanguage(lan);
+            nameDictionary.setMachineType(machineType);
             nameDictionaryService.save(nameDictionary);
             i++;
         }
@@ -109,5 +109,24 @@ public class TNameDictionaryController {
         }
         return "success";
     }
+
+    @GetMapping("/savePop")
+    public String savePop(String nameStr, String lan) {
+//        String[] noStr = {"B01", "B02", "B03", "B04", "B05", "B06"};
+//        List<String> str = new ArrayList<>();
+        String[] strings = nameStr.split(",");
+        for (String s : strings) {
+            String[] split = s.split("-");
+            TNameDictionary nameDictionary = new TNameDictionary();
+            nameDictionary.setCreateDate(new Date());
+            nameDictionary.setModifyDate(new Date());
+            nameDictionary.setName(split[0]);
+            nameDictionary.setNo(split[1]);
+            nameDictionary.setLanguage(lan);
+            nameDictionary.setMachineType("0");
+            nameDictionaryService.save(nameDictionary);
+        }
+        return "success";
+    }
 }
 

src/main/java/com/szwl/feign/SzwlFeign.java

@@ -20,19 +20,19 @@ public interface SzwlFeign {
     public ResponseModel<List<?>> testList(TAdminParam param);
 
     @GetMapping("/tAdmin/getAdminIdList")
-    ResponseModel<List<Long>>  getAdminIdList(@RequestParam String adminId);
+    ResponseModel<List<Long>> getAdminIdList(@RequestParam String adminId);
 
     @GetMapping("/tAdmin/getAdminByUsername")
-    ResponseModel<TAdmin>  getAdminByUsername(@RequestParam String username);
+    ResponseModel<TAdmin> getAdminByUsername(@RequestParam String username);
 
     @GetMapping("/tAdmin/getAdmin")
-    ResponseModel<TAdmin>  getAdmin(@RequestParam String id);
+    ResponseModel<TAdmin> getAdmin(@RequestParam String id);
 
     @GetMapping("/tEquipment/getClientIdList")
-    ResponseModel<TAdminEquipment>  getClientIdList(@RequestParam String adminId);
+    ResponseModel<TAdminEquipment> getClientIdList(@RequestParam String adminId);
 
     @GetMapping("/tEquipment/getClientIds")
-    ResponseModel<List<String>>  getClientIds(@RequestParam String adminId);
+    ResponseModel<List<String>> getClientIds(@RequestParam String adminId);
 
     @GetMapping("/tEquipment/findEquipmentByClientId")
     ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String clientId);
@@ -40,16 +40,14 @@ public interface SzwlFeign {
     @PostMapping("/tEquipment/getEquipmentByNameAndId")
     ResponseModel<TEquipment> getEquipmentByNameAndId(@RequestBody TEquipment equipment);
 
-//    @PostMapping("/tEquipment/findById2")
-//    ResponseModel<TEquipment> findById(@RequestParam String id);
     @GetMapping("/tEquipment/findEquipmentById")
     ResponseModel<TEquipment> findById(@RequestParam String id);
 
     @GetMapping("/tAdmin/pageAdmin2")
-    ResponseModel<IPage<TAdmin>>  pageAdmin2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
+    ResponseModel<IPage<TAdmin>> pageAdmin2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
 
     @GetMapping("/tEquipment/pageEquipment2")
-    ResponseModel<IPage<TEquipment>>  pageEquipment2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
+    ResponseModel<IPage<TEquipment>> pageEquipment2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
 
     @GetMapping("/tShandeMch/getShandeMch")
     ResponseModel<TShandeMch> getShandeMch(@RequestParam String adminId);
@@ -74,17 +72,19 @@ public interface SzwlFeign {
 
     /**
      * 获取openId
-     * @param adminId
-     * @return
+     *
+     * @param adminId 用户ID
+     * @return openId
      */
     @GetMapping("/tWechat/getOpenId")
     ResponseModel<String> getOpenId(@RequestParam Long adminId);
 
     /**
      * 校验apiKey
-     * @param apiKey
-     * @param adminId
-     * @return
+     *
+     * @param apiKey 密钥
+     * @param adminId 用户ID
+     * @return Admin
      */
     @GetMapping("/tAdmin/validateApiKey")
     ResponseModel<TAdmin> validateApiKey(@RequestParam String apiKey, @RequestParam Long adminId);

src/main/java/com/szwl/mapper/xml/TNameDictionaryMapper.xml

@@ -9,12 +9,13 @@
         <result column="modify_date" property="modifyDate" />
         <result column="name" property="name" />
         <result column="no" property="no" />
+        <result column="machine_type" property="machineType" />
         <result column="language" property="language" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, name, no, language
+        id, create_date, modify_date, name, no, machine_type, language
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/entity/TNameDictionary.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-12-18
+ * @since 2024-04-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -33,12 +33,15 @@ public class TNameDictionary implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
-    @ApiModelProperty(value = "花型名称")
+    @ApiModelProperty(value = "商品名称")
     private String name;
 
     @ApiModelProperty(value = "商品编号")
     private String no;
 
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1：爆米花，2：冰淇淋")
+    private String machineType;
+
     @ApiModelProperty(value = "语种")
     private String language;
 

src/main/java/com/szwl/model/utils/AdminUtils.java

@@ -20,11 +20,11 @@ public final class AdminUtils {
     /**
      * 将id转成加密样式
      */
-    public static String encrypt(boolean isPrefix , Long id) {
+    public static String encrypt(boolean isPrefix, Long id) {
         id = id * base2 + base1;
-        if(isPrefix){
+        if (isPrefix) {
             return prefix + id.toString();
-        }else{
+        } else {
             return id.toString();
         }
 
@@ -34,16 +34,21 @@ public final class AdminUtils {
     /**
      * 解密id
      */
-    public static Long decrypt(boolean isPrefix , String uid) {
+    public static Long decrypt(boolean isPrefix, String uid) {
         try {
-            if(isPrefix){
+            if (isPrefix) {
                 uid = uid.substring(1, uid.length());
             }
 
             Long id = Long.valueOf(uid);
             id = id - base1;
-            id = id / base2;
-            return id;
+            long l = id % base2;
+            if (l == 0) {
+                id = id / base2;
+                return id;
+            } else {
+                return null;
+            }
         } catch (Exception e) {
             return null;
         }

src/main/java/com/szwl/service/TNameDictionaryService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2023-12-18
+ * @since 2024-04-11
  */
 public interface TNameDictionaryService extends IService<TNameDictionary> {
 

src/main/java/com/szwl/service/impl/TNameDictionaryServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2023-12-18
+ * @since 2024-04-11
  */
 @Service
 public class TNameDictionaryServiceImpl extends ServiceImpl<TNameDictionaryMapper, TNameDictionary> implements TNameDictionaryService {