Merge branch 'master' into lcy

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

@@ -4,7 +4,7 @@ server:
   port: 8100
   servlet:
     # 应用的访问路径
-    context-path: /
+    context-path: /szzs
 
 --- # 监控中心配置
 spring.boot.admin.client:

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/controller/EquipmentController.java

@@ -10,9 +10,13 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.entity.PlanItem;
+import com.ruoyi.demo.entity.bo.EquipmentBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
+import com.ruoyi.demo.entity.bo.StateBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
+import com.ruoyi.demo.enums.EquipmentOnStateEnum;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.service.EquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -20,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -58,7 +63,7 @@ public class EquipmentController {
      */
     @GetMapping("/getEquipment")
     public R getEquipment(@NotBlank String equipmentId){
-        Equipment equipment = equipmentService.getEquipment(equipmentId);
+        EquipmentBo equipment = equipmentService.getEquipment(equipmentId);
         return R.ok(equipment);
     }
 
@@ -166,4 +171,38 @@ public class EquipmentController {
         int count = equipmentService.getEquipmentCount();
         return R.ok(count);
     }
+
+    /**
+     * 获取设备授权状态（下拉框）
+     * @return
+     */
+    @GetMapping("/getEquipmentState")
+    public R getEquipmentState(){
+        EquipmentStateEnum[] values = EquipmentStateEnum.values();
+        ArrayList<StateBo> list = new ArrayList<>();
+        for (EquipmentStateEnum value : values) {
+            StateBo stateBo = new StateBo();
+            stateBo.setState(value.getState());
+            stateBo.setName(value.getName());
+            list.add(stateBo);
+        }
+        return R.ok(list);
+    }
+
+    /**
+     * 获取设备在线状态（下拉框）
+     * @return
+     */
+    @GetMapping("/getEquipmentOnState")
+    public R getEquipmentOnState(){
+        EquipmentOnStateEnum[] values = EquipmentOnStateEnum.values();
+        ArrayList<StateBo> list = new ArrayList<>();
+        for (EquipmentOnStateEnum value : values) {
+            StateBo stateBo = new StateBo();
+            stateBo.setState(value.getState());
+            stateBo.setName(value.getName());
+            list.add(stateBo);
+        }
+        return R.ok(list);
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SystemSetterController.java

@@ -0,0 +1,30 @@
+package com.ruoyi.demo.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.demo.entity.SystemSetter;
+import com.ruoyi.demo.entity.vo.SystemSetterVo;
+import com.ruoyi.demo.service.SystemSetterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/system")
+public class SystemSetterController {
+    @Autowired
+    SystemSetterService systemSetterService;
+
+    @GetMapping("/getSystemSetter")
+    public R getSystemSetter(){
+        SystemSetter systemSetter = systemSetterService.getSystemSetter();
+        System.out.println(systemSetter);
+        return R.ok(systemSetter);
+    }
+
+    @PutMapping("/updateSystemSetter")
+    public R updateSystemSetter(@RequestBody @Validated(value = {EditGroup.class}) SystemSetterVo systemSetterVo){
+        systemSetterService.updateSystemSetter(systemSetterVo);
+        return R.ok();
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/SystemSetter.java

@@ -2,9 +2,12 @@ package com.ruoyi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.demo.entity.vo.SystemSetterVo;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 @TableName("dl_system_setter")
 public class SystemSetter {
     @TableField("interval_carousel")
@@ -13,4 +16,10 @@ public class SystemSetter {
     private Integer intervalRequest;
     @TableField("interval_submit")
     private Integer intervalSubmit;
+
+    public SystemSetter(SystemSetterVo systemSetterVo) {
+        this.intervalCarousel = systemSetterVo.getIntervalCarousel();
+        this.intervalRequest = systemSetterVo.getIntervalRequest();
+        this.intervalSubmit = systemSetterVo.getIntervalSubmit();
+    }
 }

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

@@ -14,8 +14,8 @@ public class EquipmentBo {
     private String addrCodeInfo;
     private BigDecimal lat;
     private BigDecimal lng;
-    private Integer state;
-    private Integer onState;
+    private String state;
+    private String onState;
     private Integer planCounnt;
     private String storeId;
     private String manufacturers;
@@ -33,8 +33,6 @@ public class EquipmentBo {
         this.addrCode = equipment.getAddrCode();
         this.lat = equipment.getLat();
         this.lng = equipment.getLng();
-        this.state = equipment.getState();
-        this.onState = equipment.getOnState();
         this.storeId = equipment.getStoreId();
         this.manufacturers = equipment.getManufacturers();
         this.maintainName = equipment.getMaintainName();

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/bo/StateBo.java

@@ -0,0 +1,9 @@
+package com.ruoyi.demo.entity.bo;
+
+import lombok.Data;
+
+@Data
+public class StateBo {
+    int state;
+    String name;
+}

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/entity/vo/SystemSetterVo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SystemSetterVo {
+    @NotNull(groups = {EditGroup.class},message = "轮播间隔设置不能为空")
+    private Integer intervalCarousel;
+
+    @NotNull(groups = {EditGroup.class},message = "请求广告间隔设置不能为空")
+    private Integer intervalRequest;
+
+    @NotNull(groups = {EditGroup.class},message = "曝光量上报时间间隔设置不能为空")
+    private Integer intervalSubmit;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentOnStateEnum.java

@@ -0,0 +1,31 @@
+package com.ruoyi.demo.enums;
+
+public enum EquipmentOnStateEnum {
+    ON_LINE(0,"在线"),
+    OFF_LINE(1,"失联");
+
+    private int state;
+    private String name;
+
+
+    EquipmentOnStateEnum(int state,String name) {
+        this.state = state;
+        this.name = name;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentStateEnum.java

@@ -0,0 +1,33 @@
+package com.ruoyi.demo.enums;
+
+
+public enum EquipmentStateEnum {
+    ON_POWER(0,"开启"),
+    OFF_POWER(1,"关闭"),
+    MAINTAIN_POWER(2,"维修中");
+
+    private int state;
+    private String name;
+
+
+    EquipmentStateEnum(int state,String name) {
+        this.state = state;
+        this.name = name;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/init/BenyunCoreInit.java

@@ -2,12 +2,17 @@ package com.ruoyi.demo.init;
 
 import com.ruoyi.demo.constant.RedisInitContant;
 import com.ruoyi.demo.entity.AddrCategory;
+import com.ruoyi.demo.enums.EquipmentOnStateEnum;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.mapper.AddrCategoryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
+
 @Configuration
 public class BenyunCoreInit {
     @Autowired
@@ -16,7 +21,6 @@ public class BenyunCoreInit {
     @Autowired
     RedisTemplate redisTemplate;
 
-
     @PostConstruct
     public void initAddrCodeMap() {
         if(redisTemplate.hasKey(RedisInitContant.INIT_ADDR_CODE_MAP))
@@ -28,4 +32,22 @@ public class BenyunCoreInit {
         System.out.println("AddrCodeMap已完成");
     }
 
+    @Bean("equipmentStateMap")
+    public HashMap<Integer,String> getEquipmentStateMap(){
+        HashMap<Integer, String> equipmentStateMap = new HashMap<>();
+        for (EquipmentStateEnum value : EquipmentStateEnum.values()) {
+            equipmentStateMap.put(value.getState(),value.getName());
+        }
+        return equipmentStateMap;
+    }
+
+    @Bean("equipmentOnStateMap")
+    public HashMap<Integer,String> getEquipmentOnStateMap(){
+        HashMap<Integer, String> equipmentOnStateMap = new HashMap<>();
+        for (EquipmentOnStateEnum value : EquipmentOnStateEnum.values()) {
+            equipmentOnStateMap.put(value.getState(),value.getName());
+        }
+        return equipmentOnStateMap;
+    }
+
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.PlanItem;
+import com.ruoyi.demo.entity.bo.EquipmentBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
@@ -17,7 +18,7 @@ public interface EquipmentService {
 
     void updateEquipment(EquipmentVo equipmentVo);
 
-    Equipment getEquipment(String equipmentId);
+    EquipmentBo getEquipment(String equipmentId);
 
     void deleteEquipment(String[] equipmentIds);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/SystemSetterService.java

@@ -0,0 +1,10 @@
+package com.ruoyi.demo.service;
+
+import com.ruoyi.demo.entity.SystemSetter;
+import com.ruoyi.demo.entity.vo.SystemSetterVo;
+
+public interface SystemSetterService {
+    SystemSetter getSystemSetter();
+
+    void updateSystemSetter(SystemSetterVo systemSetterVo);
+}

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

@@ -15,12 +15,14 @@ import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.mapper.EquipmentMapper;
 import com.ruoyi.demo.mapper.PlanItemMapper;
 import com.ruoyi.demo.mapper.PlanMapper;
 import com.ruoyi.demo.service.EquipmentService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -39,6 +41,13 @@ public class EquipmentServiceImpl implements EquipmentService {
 
     @Autowired
     PlanMapper planMapper;
+    @Autowired
+    @Qualifier("equipmentStateMap")
+    HashMap<Integer,String> equipmentStateMap;
+
+    @Autowired
+    @Qualifier("equipmentOnStateMap")
+    HashMap<Integer,String> equipmentOnStateMap;
     @Override
     public void addEquipment(EquipmentVo equipmentVo) {
         Equipment equipment = new Equipment(equipmentVo);
@@ -70,11 +79,24 @@ 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
-    public Equipment getEquipment(String equipmentId) {
-        return equipmentMapper.selectById(equipmentId);
+    public EquipmentBo getEquipment(String equipmentId) {
+        Equipment equipment = equipmentMapper.selectById(equipmentId);
+        EquipmentBo equipmentBo = new EquipmentBo(equipment);
+        equipmentBo.setState(equipmentStateMap.get(equipment.getState()));
+        equipmentBo.setOnState(equipmentOnStateMap.get(equipment.getOnState()));
+        return equipmentBo;
     }
 
     @Override
@@ -134,6 +156,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()
@@ -204,6 +229,8 @@ public class EquipmentServiceImpl implements EquipmentService {
         List<EquipmentBo> result = new ArrayList<>();
         for (Equipment equipment1 : equipmentPage.getRecords()) {
             EquipmentBo equipmentBo = new EquipmentBo(equipment1);
+            equipmentBo.setState(equipmentStateMap.get(equipment1.getState()));
+            equipmentBo.setOnState(equipmentOnStateMap.get(equipment1.getOnState()));
             Integer integer = hashMap.get(equipmentBo.getEquipmentId());
             if (integer == null){
                 equipmentBo.setPlanCounnt(0);

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

@@ -0,0 +1,25 @@
+package com.ruoyi.demo.service.impl;
+
+import com.ruoyi.demo.entity.SystemSetter;
+import com.ruoyi.demo.entity.vo.SystemSetterVo;
+import com.ruoyi.demo.mapper.SystemSetterMapper;
+import com.ruoyi.demo.service.SystemSetterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemSetterServiceImpl implements SystemSetterService {
+    @Autowired
+    SystemSetterMapper systemSetterMapper;
+    @Override
+    public SystemSetter getSystemSetter() {
+        SystemSetter systemSetter = systemSetterMapper.selectOne(null);
+        return systemSetter;
+    }
+
+    @Override
+    public void updateSystemSetter(SystemSetterVo systemSetterVo) {
+        SystemSetter systemSetter = new SystemSetter(systemSetterVo);
+        systemSetterMapper.update(systemSetter,null);
+    }
+}

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>