2021/6/22 common全局异常捕获修改

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

@@ -12,6 +12,7 @@ import com.huimv.common.utils.R;
 import org.apache.shiro.authz.AuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
@@ -102,10 +103,10 @@ public class RRExceptionHandler {
 		return R.error(1001,e.getMessage());
 	}
 
-	@ExceptionHandler(SQLException.class)
-	public R handMissingServletRequestParameterException(SQLException e) {
+	@ExceptionHandler(DataIntegrityViolationException.class)
+	public R handSQLException(DataIntegrityViolationException e) {
 		logger.error(e.getMessage(),e);
-		return R.error(1001,e.getMessage());
+		return R.error(1001,e.getCause().getMessage().split(" ")[1] + "没有默认值!");
 	}
 
 	@ExceptionHandler(Exception.class)

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

@@ -43,11 +43,11 @@ public class YearPigBaseEntity implements Serializable {
     /**
      * 是否认养
      */
-    private Boolean fosterStatus;
+    private Integer fosterStatus;
     /**
      * 是否健康
      */
-    private Boolean healthStatus;
+    private Integer healthStatus;
     /**
      * 去向信息
      */

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

@@ -3,12 +3,8 @@ package com.huimv.management.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.huimv.management.dao.PigstyDao;
-import com.huimv.management.entity.UnitEntity;
-import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.vo.DrinkingWaterVo;
-import com.huimv.management.entity.vo.PigBaseVo;
 import com.huimv.management.entity.vo.UnitVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,7 +19,6 @@ import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.Query;
 
 import com.huimv.management.dao.UnitDao;
-import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.service.UnitService;
 
 
@@ -39,7 +34,6 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         QueryWrapper<DrinkingWaterVo> queryWrapper = new QueryWrapper<>();
 
         String formFarmId = (String) params.get("formFarmId");
-        System.out.println(formFarmId);
         if (StringUtils.isNotBlank(formFarmId)) {
             queryWrapper.eq("unit.farm_id", Integer.parseInt(formFarmId));
         }

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

@@ -286,21 +286,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     @Transactional(rollbackFor = Exception.class)
     public void transferPeriod(HashMap<String, Object> map, HttpServletRequest request) {
 
-//        String token = request.getHeader("token");
-//
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("token", token);
-//        HttpEntity httpEntity = new HttpEntity<>(null, headers);
-//
-//        ResponseEntity<R> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, R.class);
-//        R sysUserEntity = responseEntity.getBody();
-//        if (401 == (Integer) (sysUserEntity.get("code"))) {
-//            throw new RRException((String) sysUserEntity.get("msg"), (Integer) sysUserEntity.get("code"));
-//        }
-//        String jsonString = JSONObject.toJSONString(sysUserEntity.get("user"));
-//        SysUserEntity user = JSONObject.parseObject(jsonString, SysUserEntity.class);
-
-
         List<Integer> pigIds = (List<Integer>) map.get("pigIds");
         Integer unitId = (Integer) map.get("unitId");