2021/6/24 报警信息修改

huimv-smart-management/src/main/java/com/huimv/management/Abc.java

@@ -1,5 +1,6 @@
 package com.huimv.management;
 
+import cn.hutool.core.collection.CollUtil;
 import com.huimv.common.utils.Constant;
 import com.huimv.management.rsa.JdkSignatureUtil;
 import com.huimv.management.util.GetUserUtil;
@@ -11,8 +12,8 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.Date;
-import java.util.Random;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -84,23 +85,27 @@ public class Abc {
 //        GetUserUtil.getUser(null);
 
 
-        int floor = 6;
-
-        for (int i = 1; i <= floor; i++) {
-
-            for (int k = 1; k <= floor - i; k++) {
-                System.out.print(" ");
-            }
+//        int floor = 6;
+//
+//        for (int i = 1; i <= floor; i++) {
+//
+//            for (int k = 1; k <= floor - i; k++) {
+//                System.out.print(" ");
+//            }
+//
+//            for (int j = 1; j <= 2 * i - 1; j++) {
+//                if (j == 1 || j == 2 * i - 1 || i == floor) {
+//                    System.out.print("*");
+//                } else {
+//                    System.out.print(" ");
+//                }
+//            }
+//
+//            System.out.println();
+//        }
 
-            for (int j = 1; j <= 2 * i - 1; j++) {
-                if (j == 1 || j == 2 * i - 1 || i == floor) {
-                    System.out.print("*");
-                } else {
-                    System.out.print(" ");
-                }
-            }
+        String s = "111122345";
+        List<Integer> collect = Arrays.stream(s.split("")).map(Integer::parseInt).collect(Collectors.toList());
 
-            System.out.println();
-        }
     }
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/DrinkingWaterController.java

@@ -4,6 +4,7 @@ import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 import com.huimv.management.service.DrinkingWaterService;
 import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +33,7 @@ public class DrinkingWaterController {
      * 列表
      */
     @GetMapping("/list")
+    @RequiresPermissions("management:drinkingWater:list")
     public R list(@RequestParam Map<String, Object> params){
         PageUtils page = drinkingWaterService.queryPage(params);
         return R.ok().put("page", page);

huimv-smart-management/src/main/java/com/huimv/management/entity/WarningInfoEntity.java

@@ -38,9 +38,13 @@ public class WarningInfoEntity implements Serializable {
 	 */
 	private Integer pigstyId;
 	/**
+	 * 单元id
+	 */
+	private Integer unitId;
+	/**
 	 * 耳标号
 	 */
-	private Integer earTag;
+	private String earTag;
 	/**
 	 * 报警类型 
 		--室内环境

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/TransferPeriodLogVo.java

@@ -60,7 +60,7 @@ public class TransferPeriodLogVo  implements Serializable {
     /**
      * 新单元名称
      */
-    private String newUintName;
+    private String newUnitName;
     /**
      * 旧栏期
      */

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/WarningInfoVo.java

@@ -45,9 +45,17 @@ public class WarningInfoVo implements Serializable {
      */
     private String pigstyName;
     /**
+     * 单元id
+     */
+    private Integer unitId;
+    /**
+     * 单元名称
+     */
+    private String unitName;
+    /**
      * 耳标号
      */
-    private Integer earTag;
+    private String earTag;
     /**
      * 报警类型(数字)
      */

huimv-smart-management/src/main/java/com/huimv/management/service/impl/EartagDateServiceImpl.java

@@ -43,8 +43,8 @@ public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDate
         //构建条件查询wrapper
         //耳标
          String eartag = (String) params.get("eartag");
-        String starttime = (String) params.get("starttime");
-        String endtime = (String) params.get("endtime");
+        String starttime = (String) params.get("startTime");
+        String endtime = (String) params.get("endTime");
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Map map1 = new HashMap();

huimv-smart-management/src/main/java/com/huimv/management/service/impl/TransferPeriodLogServiceImpl.java

@@ -37,9 +37,9 @@ public class TransferPeriodLogServiceImpl extends ServiceImpl<TransferPeriodLogD
             queryWrapper.eq("log.old_pigsty_id",Integer.parseInt(oldPigstyId));
         }
 
-        String newPigStyId = (String) params.get("newPigStyId");
-        if (StringUtils.isNotBlank(newPigStyId)) {
-            queryWrapper.eq("log.new_pigsty_id",newPigStyId);
+        String newPigstyId = (String) params.get("newPigstyId");
+        if (StringUtils.isNotBlank(newPigstyId)) {
+            queryWrapper.eq("log.new_pigsty_id",newPigstyId);
         }
 
         String oldUnitId = (String) params.get("oldUnitId");
@@ -52,7 +52,7 @@ public class TransferPeriodLogServiceImpl extends ServiceImpl<TransferPeriodLogD
             queryWrapper.eq("log.new_unit_id",Integer.parseInt(newUnitId));
         }
 
-        queryWrapper.apply("pigsty1.deleted = 0 AND pigsty2.deleted = 0 AND uint1.deleted = 0 AND unit2.deleted = 0 AND period1.deleted = 0 AND period2.deleted = 0");
+        queryWrapper.apply("pigsty1.deleted = 0 AND pigsty2.deleted = 0 AND unit1.deleted = 0 AND unit2.deleted = 0 AND period1.deleted = 0 AND period2.deleted = 0");
         queryWrapper.orderByDesc("log.gmt_create");
 
         IPage<TransferPeriodLogVo> page = baseMapper.page(new Query<>().getPage(params), queryWrapper);

huimv-smart-management/src/main/java/com/huimv/management/service/impl/WarningInfoServiceImpl.java

@@ -39,29 +39,34 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
 
         String belongTo = (String) params.get("belongTo");
         if (StringUtils.isBlank(belongTo)) {
-            throw new RRException("报警所属范围(室内,室外,体温)不能为空!");
+            throw new RRException("报警所属范围(室内,室外,耳标)不能为空!");
         }
-        queryWrapper.eq("warn.belong_to",Short.parseShort(belongTo));
+        queryWrapper.eq("warn.belong_to", Short.parseShort(belongTo));
 
         //报警类型
         String warningType = (String) params.get("warningType");
         if (StringUtils.isNotBlank(warningType)) {
-            queryWrapper.eq("warn.warning_type",Short.parseShort(warningType));
+            queryWrapper.eq("warn.warning_type", Short.parseShort(warningType));
         }
         //牧场id
         String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotBlank(farmId)) {
-            queryWrapper.eq(StringUtils.isNotBlank(farmId),"warn.farm_id",Integer.parseInt(farmId));
+            queryWrapper.eq("warn.farm_id", Integer.parseInt(farmId));
         }
         //猪舍id
         String pigstyId = (String) params.get("pigstyId");
         if (StringUtils.isNotBlank(pigstyId)) {
-            queryWrapper.eq(StringUtils.isNotBlank(pigstyId),"warn.pigsty_id",Integer.parseInt(pigstyId));
+            queryWrapper.eq("warn.pigsty_id", Integer.parseInt(pigstyId));
+        }
+
+        String unitId = (String) params.get("unitId");
+        if (StringUtils.isNotBlank(unitId)) {
+            queryWrapper.eq("warn.unit_id", Integer.parseInt(unitId));
         }
         //猪耳标号
         String earTag = (String) params.get("earTag");
         if (StringUtils.isNotBlank(earTag)) {
-            queryWrapper.eq(StringUtils.isNotBlank(earTag),"warn.ear_tag",Integer.parseInt(earTag));
+            queryWrapper.eq("warn.ear_tag", earTag);
         }
         //时间区间(前)
         String startTime = (String) params.get("startTime");
@@ -69,12 +74,12 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
         String endTime = (String) params.get("endTime");
 
         queryWrapper
-                .ge(StringUtils.isNotBlank(startTime),"warn.warning_time",startTime)
-                .le(StringUtils.isNotBlank(endTime),"warn.warning_time",endTime)
-                .apply("warn.verify_status = 0 AND farm.deleted = 0 AND pigsty.deleted = 0")
+                .ge(StringUtils.isNotBlank(startTime), "warn.warning_time", startTime)
+                .le(StringUtils.isNotBlank(endTime), "warn.warning_time", endTime)
+                .apply("warn.verify_status = 0 AND farm.deleted = 0 AND IFNULL(pigsty.deleted,0) = 0 AND IFNULL(unit.deleted,0) = 0")
                 .orderByDesc("warn.warning_time");
 
-        IPage<WarningInfoVo> page = baseMapper.page(new Query<>().getPage(params),queryWrapper);
+        IPage<WarningInfoVo> page = baseMapper.page(new Query<>().getPage(params), queryWrapper);
         return new PageUtils(page);
 
     }
@@ -84,9 +89,9 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
 
         LambdaUpdateWrapper<WarningInfoEntity> updateWrapper = Wrappers.lambdaUpdate();
 
-        updateWrapper.set(WarningInfoEntity::getVerifyDescription,warningInfoDto.getVerifyDescription())
-                .set(WarningInfoEntity::getVerifyStatus,true)
-                .eq(WarningInfoEntity::getId,warningInfoDto.getId());
+        updateWrapper.set(WarningInfoEntity::getVerifyDescription, warningInfoDto.getVerifyDescription())
+                .set(WarningInfoEntity::getVerifyStatus, true)
+                .eq(WarningInfoEntity::getId, warningInfoDto.getId());
 
         update(updateWrapper);
     }

huimv-smart-management/src/main/resources/mapper/management/TransferPeriodLogDao.xml

@@ -22,7 +22,7 @@
 
     <!--批量插入-->
     <insert id="batchInsert">
-        INSERT INTO mgt_transfer_period_log(farm_id, pig_id, ear_tag, old_unit_id, new_unit_id, old_period_id, new_period_id, gmt_create, gmt_modified, operator_username) values
+        INSERT INTO mgt_transfer_period_log(farm_id, pig_id, ear_tag, old_pigsty_id, new_pigsty_id, old_unit_id, new_unit_id, old_period_id, new_period_id, gmt_create, gmt_modified, operator_username) values
         <foreach collection="list" item="item" separator=",">
             (
             #{item.farmId},
@@ -46,12 +46,13 @@
         SELECT
           log.id,
           log.pig_id,
+          log.ear_tag,
           old_pigsty_id,
           pigsty1.number old_pigsty_name,
           new_pigsty_id,
           pigsty2.number new_pigsty_name,
           old_unit_id,
-          unit1.number old_uint_name,
+          unit1.number old_unit_name,
           new_unit_id,
           unit2.number new_unit_name,
           old_period_id,

huimv-smart-management/src/main/resources/mapper/management/WarningInfoDao.xml

@@ -9,6 +9,8 @@
         <result property="nowDate" column="now_date"/>
         <result property="farmId" column="farm_id"/>
         <result property="pigstyId" column="pigsty_id"/>
+        <result property="unitId" column="unit_id" />
+        <result property="earTag" column="ear_tag" />
         <result property="warningType" column="warning_type"/>
         <result property="nowValue" column="now_value"/>
         <result property="warningTime" column="warning_time"/>
@@ -25,6 +27,8 @@
           farm.name farm_name,
           warn.pigsty_id,
           pigsty.number pigsty_name,
+          warn.unit_id,
+          unit.number unit_name,
           warn.ear_tag,
           warn.warning_type,
           warn.belong_to,
@@ -33,6 +37,7 @@
         FROM mgt_warning_info warn
         LEFT JOIN mgt_farm farm ON warn.farm_id = farm.id
         LEFT JOIN mgt_pigsty pigsty ON warn.pigsty_id = pigsty.id
+        LEFT JOIN mgt_unit unit ON warn.unit_id = unit.id
         ${ew.customSqlSegment}
     </select>
 

renren-fast/src/main/resources/application-dev.yml

@@ -22,8 +22,8 @@ spring:
             stat-view-servlet:
                 enabled: true
                 url-pattern: /druid/*
-                #login-username: admin
-                #login-password: admin
+                login-username: admin
+                login-password: admin
             filter:
                 stat:
                     log-slow-sql: true