完成商户管理、店铺管理、app管理、设备管理基本功能(v3.0)

ruoyi-admin/src/main/resources/application.yml

@@ -157,6 +157,7 @@ mybatis-plus:
     # MyBatis 自动映射策略
     # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
     autoMappingBehavior: PARTIAL
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl  #显示sql日志
     # MyBatis 自动映射时未知列或未知属性处理策
     # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
     autoMappingUnknownColumnBehavior: NONE

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/PlanItemBo.java

@@ -17,6 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 public class PlanItemBo {
+    private String itemId;
     private String planId;
     private String commercialId;
     private String commercialName;
@@ -43,6 +44,9 @@ public class PlanItemBo {
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime planEndTime;
 
+    @TableField("deleted")
+    private int deleted;
+
     public PlanItemBo(Plan plan) {
         this.planId = plan.getPlanId();
         this.commercialId = plan.getCommercialId();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/CommercialVo.java

@@ -10,28 +10,28 @@ import java.time.LocalDateTime;
 
 @Data
 public class CommercialVo {
-    @NotBlank(groups = {EditGroup.class})
+    @NotBlank(groups = {EditGroup.class},message = "商户Id不能为空")
     private String commercialId;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "商户名称不能为空")
     private String commercialName;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "统一信用代码不能为空")
     private String code;
 
     private String commercialType;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "负责人名称不能为空")
     private String principalName;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "负责人联系方式不能为空")
     private String principalTelephone;
     private String prove1;
     private String prove2;
     private String prove3;
     private String prove4;
     private String prove5;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "地区Code不能为空")
     private String addrCode;
     private String addrCodeInfo;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "公司注册地址不能为空")
     private String addrInfo;
     private LocalDateTime createTime;
     private Integer deleted;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanItemVo.java

@@ -5,6 +5,7 @@ import com.ruoyi.demo.entity.PlanItem;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Data
 public class PlanItemVo {
@@ -16,7 +17,7 @@ public class PlanItemVo {
     private String addrCode;
     private String addrCodeInfo;
     private String qrCode;
-    @NotBlank(groups = {EditGroup.class})
+    @NotNull(groups = {EditGroup.class})
     private Integer sort;
 
     public PlanItemVo(){}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -85,18 +85,20 @@ public class CommercialServiceImpl implements CommericalService {
             result.add(commercialBo);
         }
 
-        QueryWrapper<App> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.select("commercial_id","app_name");
-        queryWrapper1.in("commercial_id",commercialIds);
-        List<App> apps = appMapper.selectList(queryWrapper1);
-        //2.组装Bo
-        for (CommercialBo commercialBo : result) {
-            ArrayList<String> list = new ArrayList<>();
-            apps.stream().forEach(item -> {
-                if(item.getCommercialId().equals(commercialBo.getCommercialId()))
-                    list.add(item.getAppName());
-            });
-            commercialBo.setApps(list);
+        if (!commercialIds.isEmpty()){
+            QueryWrapper<App> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.select("commercial_id","app_name");
+            queryWrapper1.in("commercial_id",commercialIds);
+            List<App> apps = appMapper.selectList(queryWrapper1);
+            //2.组装Bo
+            for (CommercialBo commercialBo : result) {
+                ArrayList<String> list = new ArrayList<>();
+                apps.stream().forEach(item -> {
+                    if(item.getCommercialId().equals(commercialBo.getCommercialId()))
+                        list.add(item.getAppName());
+                });
+                commercialBo.setApps(list);
+            }
         }
 
         commercialPage.setRecords(null);

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -70,6 +70,15 @@ public class EquipmentServiceImpl implements EquipmentService {
             .set("maintain_telephone",equipmentVo.getMaintainTelephone())
             .set("update_time",equipmentVo.getUpdateTime());
         equipmentMapper.update(null,updateWrapper);
+
+        //修改冗余字段
+        UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
+        updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())
+            .set("addr_info",equipmentVo.getAddrInfo())
+            .set("addr_code",equipmentVo.getAddrCode())
+            .set("addr_code_info",equipmentVo.getAddrCode());
+        planItemMapper.update(null,updateWrapper1);
     }
 
     @Override
@@ -134,6 +143,9 @@ public class EquipmentServiceImpl implements EquipmentService {
 
         QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
+        });
         if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
             queryWrapper.and(planItemBoQueryWrapper -> {
                 planItemBoQueryWrapper.likeRight("plan_id",equipmentVo.getSearchText()).or()

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/SignUtil.java

@@ -32,8 +32,8 @@ public class SignUtil {
     public static boolean verify(Map<String, Object> params, String appSecret) {
         String signed = (String) params.remove("sign");
         String sign = sign(params, appSecret);
-//        System.out.println("signed:"+signed);
-//        System.out.println("sign:"+sign);
+        System.out.println("signed:"+signed);
+        System.out.println("sign:"+sign);
         return sign.equals(signed);
     }
 }

ruoyi-demo/src/main/resources/mapper/demo/PlanItemMapper.xml

@@ -16,7 +16,7 @@
 
     <select id="getEuipmentPlanList" resultType="com.ruoyi.demo.entity.bo.PlanItemBo">
         select
-            item_id,dl_plan.plan_id,commercial_id,commercial_name,appkey,app_name,goods_id,goods_img,goods_name,goods_logo,goods_introduce,goods_price,goods_classify,sort
+            item_id,dl_plan.plan_id,commercial_id,commercial_name,appkey,app_name,goods_id,goods_img,goods_name,goods_logo,goods_introduce,goods_price,goods_classify,sort,dl_plan_item.deleted
         from dl_plan,dl_plan_item
             ${ew.customSqlSegment}
     </select>