2021/6/28 报警信息对接APP修改

huimv-smart-common/src/main/java/com/huimv/common/exception/RRExceptionHandler.java

@@ -16,6 +16,7 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -109,6 +110,11 @@ public class RRExceptionHandler {
 		return R.error(1001,e.getCause().getMessage().split(" ")[1] + "没有默认值!");
 	}
 
+	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+	public R handHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+		logger.error(e.getMessage(), e);
+		return R.error(1001, e.getMessage());
+	}
 	@ExceptionHandler(Exception.class)
 	public R handleException(Exception e){
 		logger.error(e.getMessage(), e);

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

@@ -104,8 +104,11 @@ public class Abc {
 //            System.out.println();
 //        }
 
+
+
         String s = "111122345";
         List<Integer> collect = Arrays.stream(s.split("")).map(Integer::parseInt).collect(Collectors.toList());
 
+        ArrayList<Object> objects = new ArrayList<>();
     }
 }

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

@@ -1,24 +1,24 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import com.huimv.management.entity.dto.WarningInfoDto;
+import com.huimv.management.entity.vo.WarningInfoVo;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.management.entity.WarningInfoEntity;
 import com.huimv.management.service.WarningInfoService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 
+import javax.servlet.http.HttpServletRequest;
 
 
-/**
+ /**
  * <p>
  * 报警信息Controller
  * </p>
@@ -27,6 +27,7 @@ import com.huimv.common.utils.R;
  * @version 1.0
  * @date 2021-06-15 13:01:37
  */
+@Api(tags = "报警信息Controller")
 @RestController
 @RequestMapping("management/warningInfo")
 public class WarningInfoController {
@@ -36,7 +37,7 @@ public class WarningInfoController {
     /**
      * 列表
      */
-    @RequestMapping("/list")
+    @GetMapping("/list")
     public R list(@RequestParam Map<String, Object> params){
         PageUtils page = warningInfoService.queryPage(params);
 
@@ -47,7 +48,7 @@ public class WarningInfoController {
     /**
      * 信息
      */
-    @RequestMapping("/info/{id}")
+    @GetMapping("/info/{id}")
     public R info(@PathVariable("id") Integer id){
 		WarningInfoEntity warningInfo = warningInfoService.getById(id);
 
@@ -57,7 +58,7 @@ public class WarningInfoController {
     /**
      * 保存
      */
-    @RequestMapping("/save")
+    @PostMapping("/save")
     public R save(@RequestBody WarningInfoEntity warningInfo){
 		warningInfoService.save(warningInfo);
 
@@ -67,7 +68,7 @@ public class WarningInfoController {
     /**
      * 修改
      */
-    @RequestMapping("/update")
+    @PostMapping("/update")
     public R update(@RequestBody WarningInfoEntity warningInfo){
 		warningInfoService.updateById(warningInfo);
 
@@ -77,7 +78,7 @@ public class WarningInfoController {
     /**
      * 删除
      */
-    @RequestMapping("/delete")
+    @PostMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
 		warningInfoService.removeByIds(Arrays.asList(ids));
 
@@ -89,10 +90,24 @@ public class WarningInfoController {
      * @param warningInfoDto
      * @return
      */
-    @RequestMapping("/verity")
-    public R verify(@RequestBody WarningInfoDto warningInfoDto) {
-        warningInfoService.verify(warningInfoDto);
+    @PostMapping("/verity")
+    public R verify(@RequestBody WarningInfoDto warningInfoDto, HttpServletRequest request) {
+        warningInfoService.verify(warningInfoDto,request);
 
         return R.ok();
     }
+
+     /**
+      * 条件查询所有
+      * @param params
+      * @return
+      */
+    @GetMapping("/queryByCondition")
+    public R queryByCondition(@RequestParam Map<String, Object> params) {
+        List<WarningInfoVo> warningInfoVoList = warningInfoService.queryByCondition(params);
+
+        return R.ok().put("data", warningInfoVoList);
+    }
+
+
 }

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

@@ -226,12 +226,30 @@ public class YearPigBaseController {
         return R.ok().put("data",countOuts);
     }
 
+     /**
+      * 转栏
+      * @param map
+      * @param request
+      * @return
+      */
     @PostMapping("/transferPeriod")
     public R transferPeriod(@RequestBody HashMap<String,Object> map, HttpServletRequest request) {
         yearPigBaseService.transferPeriod(map,request);
         return R.ok();
     }
 
+     /**
+      * 转栏
+      * @param map
+      * @param request
+      * @return
+      */
+     @PostMapping("/transferPeriodClient")
+     public R transferPeriodClient(@RequestBody HashMap<String,Object> map, HttpServletRequest request) {
+         yearPigBaseService.transferPeriodClient(map,request);
+         return R.ok();
+     }
+
      //查询认养,未认养,出栏,育肥
      @RequestMapping("/statisticsAll")
      public R statisticsAll(@RequestParam Map<String, Object> params){

huimv-smart-management/src/main/java/com/huimv/management/dao/WarningInfoDao.java

@@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警信息Mapper
@@ -24,4 +26,6 @@ import org.springframework.stereotype.Repository;
 public interface WarningInfoDao extends BaseMapper<WarningInfoEntity> {
 
     IPage<WarningInfoVo> page(@Param("page") IPage page,@Param("ew") QueryWrapper queryWrapper);
+
+    List<WarningInfoVo> page(@Param("ew") QueryWrapper queryWrapper);
 }

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

@@ -85,7 +85,7 @@ public class WarningInfoEntity implements Serializable {
 	/**
 	 * 确认人id
 	 */
-	private Integer verifyUserId;
+	private String verifyUser;
 	/**
 	 * 确认描述
 	 */

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

@@ -75,4 +75,14 @@ public class WarningInfoVo implements Serializable {
      * 报警时间
      */
     private Date warningTime;
+
+    /**
+     * 确认人
+     */
+    private String verifyUser;
+
+    /**
+     * 确认描述
+     */
+    private String verifyDescription;
 }

huimv-smart-management/src/main/java/com/huimv/management/service/WarningInfoService.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.WarningInfoEntity;
 import com.huimv.management.entity.dto.WarningInfoDto;
+import com.huimv.management.entity.vo.WarningInfoVo;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,7 +31,15 @@ public interface WarningInfoService extends IService<WarningInfoEntity> {
     /**
      * 报警信息确认
      * @param warningInfoDto
+     * @param request
      */
-    void verify(WarningInfoDto warningInfoDto);
+    void verify(WarningInfoDto warningInfoDto, HttpServletRequest request);
+
+    /**
+     * 条件查询所有
+     * @param params
+     * @return
+     */
+    List<WarningInfoVo> queryByCondition(Map<String, Object> params);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -48,12 +48,24 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
 
     List<CountOut> suchStatisteicsMonth(String startTime, String endTime, int parseInt);
 
+    /**
+     * 转栏
+     * @param map
+     * @param request
+     */
     void transferPeriod(HashMap<String, Object> map, HttpServletRequest request);
 
     Integer countByPeriodId(Integer currentPeriodId);
 
     PageUtils fattenList(Map<String, Object> params);
 
+    /**
+     * 手机端转栏
+     * @param map
+     * @param request
+     */
+    void transferPeriodClient(HashMap<String, Object> map, HttpServletRequest request);
+
     Integer findByFosterStatus(int i, Integer formFarmId);
 
     void suchApp(String[] ids);

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

@@ -20,6 +20,7 @@ import com.huimv.management.entity.vo.DrinkingWaterVo;
 import com.huimv.management.entity.vo.IndoorEnvironmentVo;
 import com.huimv.management.service.DrinkingWaterService;
 import com.huimv.management.service.IndoorEnvironmentService;
+import com.huimv.management.util.ExportUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -59,14 +60,7 @@ public class DrinkingWaterServiceImpl extends ServiceImpl<DrinkingWaterDao, Drin
         QueryWrapper<DrinkingWaterVo> queryWrapper = buildQueryWrapper(params);
         List<DrinkingWaterVo> list = baseMapper.page(queryWrapper);
         //构建auto-poi mv对象,导出数据
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        mv.addObject(NormalExcelConstants.FILE_NAME,"饮用水指标");
-        mv.addObject(NormalExcelConstants.CLASS, DrinkingWaterVo.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("饮用水指标列表数据", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, list);
-
-        return mv;
-
+        return ExportUtil.buildModelAndView("饮用水指标", DrinkingWaterVo.class, "饮用水指标列表数据", list);
     }
 
     private QueryWrapper<DrinkingWaterVo> buildQueryWrapper(Map<String, Object> params) {

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

@@ -61,7 +61,8 @@ public class IndoorEnvironmentServiceImpl extends ServiceImpl<IndoorEnvironmentD
         //构建auto-poi mv对象,导出数据
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         mv.addObject(NormalExcelConstants.FILE_NAME,"室内环境");
-        mv.addObject(NormalExcelConstants.CLASS, IndoorEnvironmentVo.class);
+        Class<IndoorEnvironmentVo> attributeValue = IndoorEnvironmentVo.class;
+        mv.addObject(NormalExcelConstants.CLASS, attributeValue);
         mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("室内环境列表数据", "导出信息"));
         mv.addObject(NormalExcelConstants.DATA_LIST, list);
 

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.common.exception.RRException;
 import com.huimv.management.entity.dto.WarningInfoDto;
 import com.huimv.management.entity.vo.WarningInfoVo;
+import com.huimv.management.util.GetUserUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +22,8 @@ import com.huimv.management.dao.WarningInfoDao;
 import com.huimv.management.entity.WarningInfoEntity;
 import com.huimv.management.service.WarningInfoService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 报警信息ServiceImpl
@@ -34,15 +38,39 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        QueryWrapper<WarningInfoVo> queryWrapper = buildQueryWrapper(params);
+        IPage<WarningInfoVo> page = baseMapper.page(new Query<>().getPage(params), queryWrapper);
+        return new PageUtils(page);
+    }
+
+    @Override
+    public void verify(WarningInfoDto warningInfoDto, HttpServletRequest request) {
+
+        LambdaUpdateWrapper<WarningInfoEntity> updateWrapper = Wrappers.lambdaUpdate();
+
+        String username = GetUserUtil.getUser(request).getUsername();
+
+        updateWrapper.set(WarningInfoEntity::getVerifyDescription, warningInfoDto.getVerifyDescription())
+                .set(WarningInfoEntity::getVerifyStatus, true)
+                .set(WarningInfoEntity::getVerifyUser,username)
+                .eq(WarningInfoEntity::getId, warningInfoDto.getId());
+        update(updateWrapper);
+    }
+
+    @Override
+    public List<WarningInfoVo> queryByCondition(Map<String, Object> params) {
+        QueryWrapper<WarningInfoVo> queryWrapper = buildQueryWrapper(params);
+        return baseMapper.page(queryWrapper);
+    }
 
+
+    private QueryWrapper<WarningInfoVo> buildQueryWrapper(Map<String, Object> params) {
         QueryWrapper<WarningInfoVo> queryWrapper = new QueryWrapper<>();
 
         String belongTo = (String) params.get("belongTo");
-        if (StringUtils.isBlank(belongTo)) {
-            throw new RRException("报警所属范围(室内,室外,耳标)不能为空!");
+        if (StringUtils.isNotBlank(belongTo)) {
+            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)) {
@@ -58,7 +86,6 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
         if (StringUtils.isNotBlank(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));
@@ -66,7 +93,11 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
         //猪耳标号
         String earTag = (String) params.get("earTag");
         if (StringUtils.isNotBlank(earTag)) {
-            queryWrapper.eq("warn.ear_tag", earTag);
+            queryWrapper.like("warn.ear_tag", earTag);
+        }
+        String verifyStatus = (String) params.get("verifyStatus");
+        if (StringUtils.isNotBlank(verifyStatus)) {
+            queryWrapper.eq("warn.verify_status", Boolean.parseBoolean(verifyStatus));
         }
         //时间区间(前)
         String startTime = (String) params.get("startTime");
@@ -76,23 +107,10 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
         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 IFNULL(pigsty.deleted,0) = 0 AND IFNULL(unit.deleted,0) = 0")
+                .apply("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);
-        return new PageUtils(page);
-
+        return queryWrapper;
     }
 
-    @Override
-    public void verify(WarningInfoDto warningInfoDto) {
 
-        LambdaUpdateWrapper<WarningInfoEntity> updateWrapper = Wrappers.lambdaUpdate();
-
-        updateWrapper.set(WarningInfoEntity::getVerifyDescription, warningInfoDto.getVerifyDescription())
-                .set(WarningInfoEntity::getVerifyStatus, true)
-                .eq(WarningInfoEntity::getId, warningInfoDto.getId());
-
-        update(updateWrapper);
-    }
 }

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

@@ -346,6 +346,65 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     }
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void transferPeriodClient(HashMap<String, Object> map, HttpServletRequest request) {
+        String earTags = (String) map.get("earTags");
+
+        Integer unitId = (Integer) map.get("unitId");
+
+        if (StringUtils.isBlank(earTags) || unitId == null) {
+            throw new RRException("参数有误,请检查!",1001);
+        }
+        String[] earTagList = earTags.split(",");
+
+        List<TransferPeriodLogEntity> logEntityList = new ArrayList<>();
+        YearPigBaseEntity yearPigBaseEntity = new YearPigBaseEntity();
+        //获取当前操作用户
+        SysUserEntity user = GetUserUtil.getUser(request);
+        String username = user.getUsername();
+
+        LambdaQueryWrapper<YearPigBaseEntity> queryWrapper = Wrappers.lambdaQuery();
+        for (String eatTag : earTagList) {
+            queryWrapper.eq(YearPigBaseEntity::getEartag,eatTag);
+            YearPigBaseEntity oldEntity = baseMapper.selectOne(queryWrapper);
+            queryWrapper.clear();
+
+            if (oldEntity == null) {
+                throw new RRException("查不到earTag为" + eatTag + "的猪的信息,请检查参数!",1001);
+            }
+
+            if (oldEntity.getUnitId().equals(unitId)) {
+                throw new RRException(oldEntity.getEartag() + "所转单元不能和原单元相同!",1001);
+            }
+
+            UnitEntity unitEntity = unitDao.selectById(unitId);
+            if (unitEntity == null) {
+                throw new RRException("查不到id为" + unitId + "的单元的信息,请检查参数!",1001);
+            }
+
+            TransferPeriodLogEntity entity = new TransferPeriodLogEntity();
+            entity.setFarmId(unitEntity.getFarmId());
+            entity.setPigId(oldEntity.getId());
+            entity.setEarTag(eatTag);
+            entity.setOldPigstyId(oldEntity.getPigstyId());
+            entity.setNewPigstyId(unitEntity.getPigstyId());
+            entity.setOldUnitId(oldEntity.getUnitId());
+            entity.setNewUnitId(unitId);
+            entity.setOldPeriodId(oldEntity.getPeriodId());
+            entity.setNewPeriodId(unitEntity.getCurrentPeriodId());
+            entity.setOperatorUsername(username);
+            logEntityList.add(entity);
+
+            yearPigBaseEntity.setId(oldEntity.getPigstyId());
+            yearPigBaseEntity.setUnitId(unitId);
+            yearPigBaseEntity.setPeriodId(unitEntity.getCurrentPeriodId());
+            updateById(yearPigBaseEntity);
+        }
+        transferPeriodLogDao.batchInsert(logEntityList);
+    }
+
+
     //查询栏期下是否有小猪
     @Override
     public Integer countByPeriodId(Integer currentPeriodId) {

huimv-smart-management/src/main/java/com/huimv/management/util/ExportUtil.java

@@ -0,0 +1,29 @@
+package com.huimv.management.util;
+
+
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Excel工具类
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/29 16:44
+ */
+public class ExportUtil {
+
+    public static <T> ModelAndView buildModelAndView(String fileName, Class<T> className, String title, List<T> dataList) {
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, fileName);
+        mv.addObject(NormalExcelConstants.CLASS, className);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(title,"导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
+        return mv;
+    }
+}

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

@@ -15,7 +15,7 @@
         <result property="nowValue" column="now_value"/>
         <result property="warningTime" column="warning_time"/>
         <result property="verifyStatus" column="verify_status"/>
-        <result property="verifyUserId" column="verify_user_id"/>
+        <result property="verifyUser" column="verify_user"/>
     </resultMap>
 
 
@@ -33,7 +33,9 @@
           warn.warning_type,
           warn.belong_to,
           warn.now_value,
-          warn.warning_time
+          warn.warning_time,
+          warn.verify_user,
+          warn.verify_description
         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