Merge branch 'master' into lcy

ruoyi-admin/Dockerfile

@@ -2,17 +2,17 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER hst
 
-RUN mkdir -p /data/ruoyi-admin-plus/logs \
-    /data/ruoyi-admin-plus/temp \
-    /data/ruoyi-admin-plus/agent
+RUN mkdir -p /data/digital-investment/logs \
+    /data/digital-investment/temp \
+    /data/digital-investment/agent
 
-WORKDIR /data/ruoyi-admin-plus
+WORKDIR /data/digital-investment
 
 #ENV SERVER_PORT=8080
 
 #EXPOSE ${SERVER_PORT}
 
-ADD ./target/ruoyi-admin.jar ./ruoyi-admin-plus.jar
+ADD ./target/ruoyi-admin.jar ./digital-investment.jar
 
 ENTRYPOINT ["java", \
             "-Djava.security.egd=file:/dev/./urandom", \
@@ -20,4 +20,4 @@ ENTRYPOINT ["java", \
             # 应用名称 如果想区分集群节点监控 改成不同的名称即可
 #            "-Dskywalking.agent.service_name=ruoyi-server", \
 #            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
-            "-jar", "ruoyi-admin-plus.jar"]
+            "-jar", "digital-investment.jar"]

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

@@ -83,8 +83,8 @@ public class EquipmentController {
      */
     @DeleteMapping("/deleteEquipment")
     public R deleteEquipment(@NotEmpty String[] equipmentIds){
-        equipmentService.deleteEquipment(equipmentIds);
-        return R.ok();
+        String s = equipmentService.deleteEquipment(equipmentIds);
+        return R.ok(s);
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/PlanItemMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -14,4 +15,6 @@ public interface PlanItemMapper extends BaseMapper<PlanItem> {
     Integer selectEquipmentCountByPlanId(@Param("planId") String planId);
 
     IPage<PlanItemBo> getEuipmentPlanList(IPage<?> pag, @Param(Constants.WRAPPER) Wrapper<PlanItemBo> queryWrapper);
+
+    Integer getEuipmentPlanCont(QueryWrapper<PlanItemBo> queryWrapper);
 }

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

@@ -20,7 +20,7 @@ public interface EquipmentService {
 
     EquipmentBo getEquipment(String equipmentId);
 
-    void deleteEquipment(String[] equipmentIds);
+    String deleteEquipment(String[] equipmentIds);
 
     Page<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo);
 

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

@@ -17,14 +17,17 @@ import com.ruoyi.demo.utils.SendCallBackUtil;
 import com.ruoyi.demo.utils.UuidUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.List;
 
 @Service
+@Transactional
 public class AppServiceImpl implements AppService {
     @Autowired
     AppMapper appMapper;
@@ -40,7 +43,7 @@ public class AppServiceImpl implements AppService {
         //生成密钥
         app.setAppSecret(UuidUtil.getUUID());
         //时间
-        app.setCreate_time(LocalDateTime.now());
+        app.setCreate_time(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         appMapper.insert(app);
     }
 

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

@@ -16,9 +16,11 @@ import com.ruoyi.demo.service.CommericalService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -26,6 +28,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
 public class CommercialServiceImpl implements CommericalService {
     @Autowired
     CommercialMapper commercialMapper;
@@ -38,7 +41,7 @@ public class CommercialServiceImpl implements CommericalService {
     @Override
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
-        commercial.setCreateTime(LocalDateTime.now());
+        commercial.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         commercial.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(commercial.getAddrCode()));
         commercialMapper.insert(commercial);
     }

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

@@ -24,12 +24,15 @@ 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 org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
 public class EquipmentServiceImpl implements EquipmentService {
     @Autowired
     EquipmentMapper equipmentMapper;
@@ -54,7 +57,7 @@ public class EquipmentServiceImpl implements EquipmentService {
         //1.新增地区码映射
         equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
         //2.新增创建时间
-        equipment.setEnterTime(LocalDateTime.now());
+        equipment.setEnterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         equipmentMapper.insert(equipment);
     }
 
@@ -63,7 +66,7 @@ public class EquipmentServiceImpl implements EquipmentService {
         //1.更新地区码映射
         equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));
         //2.更新时间
-        equipmentVo.setUpdateTime(LocalDateTime.now());
+        equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
@@ -99,9 +102,25 @@ public class EquipmentServiceImpl implements EquipmentService {
         return equipmentBo;
     }
 
+    /*
+    * TODO 需要考虑上面有没有广告
+    * */
     @Override
-    public void deleteEquipment(String[] equipmentIds) {
+    public String deleteEquipment(String[] equipmentIds) {
+        //1.查询设备下身份有广告
+        QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("equipment_id",equipmentIds);
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
+        });
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        });
+        Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
+        if (count > 0)
+            return "设备下存在广告计划，请移除广告后在删除设备";
         equipmentMapper.deleteBatchIds(Arrays.asList(equipmentIds));
+        return "移除成功";
     }
 
 
@@ -159,6 +178,9 @@ public class EquipmentServiceImpl implements EquipmentService {
         queryWrapper.and(planItemBoQueryWrapper -> {
             planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
         });
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        });
         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/service/impl/PlanServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.CallBackBean;
 import com.ruoyi.demo.entity.bo.PlanAddBo;

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

@@ -15,8 +15,10 @@ import com.ruoyi.demo.service.StoreService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -24,6 +26,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
 public class StoreServiceImpl implements StoreService {
     @Autowired
     StoreMapper storeMapper;
@@ -38,7 +41,7 @@ public class StoreServiceImpl implements StoreService {
     public void addStore(StoreVo storeVo) {
         Store store = new Store(storeVo);
         store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
-        store.setCreateTime(LocalDateTime.now());
+        store.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         storeMapper.insert(store);
     }
 

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

@@ -6,8 +6,10 @@ import com.ruoyi.demo.mapper.SystemSetterMapper;
 import com.ruoyi.demo.service.SystemSetterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Transactional
 public class SystemSetterServiceImpl implements SystemSetterService {
     @Autowired
     SystemSetterMapper systemSetterMapper;

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

@@ -20,4 +20,10 @@
         from dl_plan,dl_plan_item
             ${ew.customSqlSegment}
     </select>
+
+    <select id="getEuipmentPlanCont" resultType="java.lang.Integer">
+        select count(*)
+        from dl_plan,dl_plan_item
+            ${ew.customSqlSegment}
+    </select>
 </mapper>