timer 模块

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/SysAccountMultilevelController.java

@@ -4,9 +4,11 @@ package com.huimv.admin.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huimv.admin.entity.AccountGroup;
 import com.huimv.admin.entity.BaseScreenCameraAccount;
 import com.huimv.admin.entity.Group;
 import com.huimv.admin.entity.SysAccountMultilevel;
+import com.huimv.admin.service.IAccountGroupService;
 import com.huimv.admin.service.IBaseScreenCameraAccountService;
 import com.huimv.admin.service.ISysAccountMultilevelService;
 import com.huimv.common.token.TokenSign;
@@ -39,6 +41,7 @@ public class SysAccountMultilevelController {
     @Autowired
     private IBaseScreenCameraAccountService baseScreenCameraAccountService;
 
+
     @PostMapping("/list")
     public Result list(@RequestBody Map map , HttpServletRequest request){
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
@@ -79,6 +82,7 @@ public class SysAccountMultilevelController {
 
     @GetMapping("/remove")
     public Result remove(@RequestParam(name ="userIds")List<Integer> userIds){
+
         accountMultilevelService.removeByIds(userIds);
 
         return new Result(10000,"删除成功",true);

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/SysGroupController.java

@@ -1,7 +1,10 @@
 package com.huimv.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huimv.admin.entity.AccountGroup;
 import com.huimv.admin.entity.Group;
+import com.huimv.admin.service.IAccountGroupService;
 import com.huimv.admin.service.IGroupService;
 import com.huimv.admin.service.ISysAccountMultilevelService;
 import com.huimv.common.token.TokenSign;
@@ -22,6 +25,8 @@ public class SysGroupController {
     private IGroupService groupService;
 
     @Autowired
+    private IAccountGroupService accountGroupService;
+    @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
 
     @PostMapping("/add")
@@ -38,6 +43,8 @@ public class SysGroupController {
 
     @RequestMapping("/remove")
     public Result removeGroup( @RequestParam("groupId") Integer groupId) {
+
+        accountGroupService.remove(new QueryWrapper<AccountGroup>().in("group_id",groupId));
         return groupService.removeGroup(groupId);
     }
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java

@@ -43,4 +43,6 @@ public class SysAccountMultilevel extends Model {
 
     private Integer lastFarmId;
 
+    private String userName;
+
 }

huimv-farm-v2/huimv-gateway/pom.xml

@@ -18,11 +18,11 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/controller/DeviceController.java

@@ -22,7 +22,6 @@ import java.util.List;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/farm/device")
 @Slf4j

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/BaseRoomMapper.java

@@ -31,4 +31,6 @@ public interface BaseRoomMapper extends BaseMapper<BaseRoom> {
     List<AllDayWater> getAllDayWater(@Param("farmId") Integer farmId);
 
     List<AllWaterEnvPowerApp> listAllWaterEnvPowerApp(@Param(Constants.WRAPPER) QueryWrapper<BaseRoom> wrapper);
+
+    void setS();
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/BaseRoomServiceImpl.java

@@ -68,7 +68,7 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         String type = map.get("type");
         String farmId = map.get("farmId");
 
-
+        baseRoomMapper.setS();
         BaseRoom baseRoom = new BaseRoom();
         if (StrUtil.isBlank(roomId)){
 //            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
@@ -154,7 +154,7 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         if (StringUtils.isNotBlank(roomName)){
             wrapper.last("where br.alias = " +roomName);
         }
-
+        baseRoomMapper.setS();
         List<AllWaterEnvPowerApp> waterEnvPowerApps = baseRoomMapper.listAllWaterEnvPowerApp(wrapper);
 
         return new Result(ResultCode.SUCCESS,waterEnvPowerApps);

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysDayWaterServiceImpl.java

@@ -55,6 +55,7 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         String roomId = map.get("roomId");
         String farmId = map.get("farmId");
         DecimalFormat df = new DecimalFormat("#.00");
+        baseRoomMapper.setS();
         BaseRoom baseRoom ;
         if (roomId == null){
             roomId ="157";

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SaveEventFromEventTimmer.java

@@ -1,58 +1,58 @@
-package com.huimv.produce.timer;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.huimv.produce.entity.SysTelecom;
-import com.huimv.produce.mapper.SysTelecomMapper;
-import com.huimv.produce.service.ISysTelecomEventService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-
-
-/**
- * 从ICC将报警信息拿到本地数据库
- */
-@Component
-public class SaveEventFromEventTimmer {
-
-
-
-    @Autowired
-    private SysTelecomMapper sysTelecomMapper;
-
-    @Autowired
-    private ISysTelecomEventService sysTelecomEventService;
-
-
-
-    //每小时执行一次
-//    @Scheduled(cron = " 0 */59 * * * ?")
-    private void updateBox() {
-
-
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        LambdaQueryWrapper<SysTelecom> lambdaQueryWrapper =
-                new LambdaQueryWrapper<>();
-
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+//package com.huimv.produce.timer;
+//
+//
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.huimv.produce.entity.SysTelecom;
+//import com.huimv.produce.mapper.SysTelecomMapper;
+//import com.huimv.produce.service.ISysTelecomEventService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//
+//
+///**
+// * 从ICC将报警信息拿到本地数据库
+// */
+//@Component
+//public class SaveEventFromEventTimmer {
+//
+//
+//
+//    @Autowired
+//    private SysTelecomMapper sysTelecomMapper;
+//
+//    @Autowired
+//    private ISysTelecomEventService sysTelecomEventService;
+//
+//
+//
+//    //每小时执行一次
+////    @Scheduled(cron = " 0 */59 * * * ?")
+//    private void updateBox() {
+//
+//
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        LambdaQueryWrapper<SysTelecom> lambdaQueryWrapper =
+//                new LambdaQueryWrapper<>();
+//
+//
+//
+//    }
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SysTelcomEnentTimmer.java

@@ -25,7 +25,7 @@ public class SysTelcomEnentTimmer {
     private ISysTelecomEventService sysTelecomEventService;
 
        //每小时执行一次
-//       @Scheduled(cron = " 0 */59 * * * ? ")
+       @Scheduled(cron = " 0 */59 * * * ? ")
        private void updateBox() {
            //获得设备列表 查找烘干数据
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

huimv-farm-v2/huimv-produce-warning/src/main/resources/com/huimv/produce/mapper/BaseRoomMapper.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.produce.mapper.BaseRoomMapper">
+    <update id="setS">
+
+        SET sql_mode =
+"STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
+    </update>
 
 
     <select id="getAllRoomEnvironment" resultType="com.huimv.produce.entity.dto.AllRoomEnvironment">
@@ -35,12 +40,13 @@
         SELECT CONCAT(br.alias ,br.room_name) room,  ROUND (IFNULL(water.`value` ,0),2) water
         FROM `base_room` br
          LEFT JOIN (
-            SELECT SUM(increase_value)`value` ,room_id  FROM `sys_month_water`  GROUP BY room_id
+            SELECT SUM(increase_value)`value` ,room_id  FROM `sys_month_water`  WHERE TO_DAYS(create_time) = TO_DAYS(NOW()) GROUP BY room_id
          )water ON water.room_id = br.id
          WHERE br.farm_id = #{farmId}
     </select>
     <select id="listAllWaterEnvPowerApp" resultType="com.huimv.produce.entity.dto.AllWaterEnvPowerApp">
 
+
         SELECT CONCAT(br.alias ,br.room_name) room_name,br.id room_id ,  ROUND(IFNULL(tem.value,0) ,2)tem,  ROUND( IFNULL(hum.value,0) ,2)hum , ROUND(IFNULL(water.`value` ,0),2) water,bf.id floor_id
         FROM
         `base_room` br

huimv-farm-v2/huimv-produce-warning/src/main/resources/com/huimv/produce/mapper/SysFodderMapper.xml

@@ -37,8 +37,8 @@
  (SELECT MAX(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  )maxHum,
 (SELECT MAX(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  )maxTem,
  (SELECT MIN(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  )minTem,
- (SELECT ROUND(SUM(`value`),2) FROM `sys_day_water` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) ) dayWater,
- (SELECT ROUND(SUM(`value`),2) FROM `sys_day_water` WHERE DATE_FORMAT( `create_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )   ) monthWater
+ (SELECT IFNULL(ROUND(SUM(`increase_value`),2),0) FROM`sys_month_water` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) ) dayWater,
+ (SELECT IFNULL(ROUND(SUM(`increase_value`),2),0) FROM `sys_month_water` WHERE DATE_FORMAT( `create_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )   ) monthWater
     </select>