2021/7/16 修复猪舍mapper问题

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

@@ -112,6 +112,11 @@ public class Abc {
 //
 //        ArrayList<Object> objects = new ArrayList<>();
 
-        System.out.println(DateUtil.date());
+//        System.out.println(DateUtil.date());
+
+        StringJoiner sj = new StringJoiner(",","未找到耳标号为：","的信息，请检查输入的耳标信息是否有误！");
+        System.out.println(sj.length());
+        sj.add("123456");
+        System.out.println(sj.length());
     }
 }

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

@@ -31,19 +31,20 @@ public class ApiServiceLocalTestController {
     @Autowired
     private RestTemplate restTemplate;
 
-    private static final String PREFIX = "http://115.238.57.190:8020/pig/";
+    @Value("${local.test.url}")
+    private  String prefix;
 
     @Value("${local.token}")
     private String accessToken;
 
     @RequestMapping("/testGetPigInfo")
     public R testGetPigInfo(@NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo) {
-        return restTemplate.getForObject(PREFIX + "getPigInfo?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
+        return restTemplate.getForObject(prefix + "getPigInfo?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
     }
 
     @RequestMapping("/testGetImage")
     public R testGetImage(@NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo) {
-        return restTemplate.getForObject(PREFIX + "getImage?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
+        return restTemplate.getForObject(prefix + "getImage?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
     }
 
     @RequestMapping("/testGetListByBreed")
@@ -51,7 +52,7 @@ public class ApiServiceLocalTestController {
                                 @RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
                                 @Range(min = 1, max = 1000, message = "每页条数的范围为1-1000") @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
                                 @RequestParam(value = "period", required = false) String period) {
-        String url = PREFIX + "getListByBreed?accessToken=" + accessToken + "&breedName=" + breedName + "&currentPage=" + currentPage + "&pageSize=" + pageSize;
+        String url = prefix + "getListByBreed?accessToken=" + accessToken + "&breedName=" + breedName + "&currentPage=" + currentPage + "&pageSize=" + pageSize;
         if (StringUtils.isNotEmpty(period)) {
             url = url + "&period=" + period;
         }
@@ -60,17 +61,17 @@ public class ApiServiceLocalTestController {
 
     @RequestMapping("/testGetIndoorEnv")
     public R testGetIndoorEnv(@NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo) {
-        return restTemplate.getForObject(PREFIX + "getIndoorEnv?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
+        return restTemplate.getForObject(prefix + "getIndoorEnv?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
     }
 
     @RequestMapping("/testAdopt")
     public R testAdopt(@NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo) {
-        return restTemplate.getForObject(PREFIX + "adopt?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
+        return restTemplate.getForObject(prefix + "adopt?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo, R.class);
     }
 
     @RequestMapping("/testOutFence")
     public R testOutFence(@NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo,
                           @NotNull(message = "出栏状态不能为空!") @ListValue(vals = {1, 2, 3}) @RequestParam("status") Integer status) {
-        return restTemplate.getForObject(PREFIX + "outFence?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo + "&status=" + status, R.class);
+        return restTemplate.getForObject(prefix + "outFence?accessToken=" + accessToken + "&pigEarTagNo=" + pigEarTagNo + "&status=" + status, R.class);
     }
 }

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

@@ -8,10 +8,7 @@ import com.huimv.management.entity.SysUserEntity;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
@@ -52,7 +49,7 @@ public class GetUserUtil {
 
         ResponseEntity<R> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, R.class);
         R r = responseEntity.getBody();
-        if (r != null && 401 == (Integer) (r.get("code"))) {
+        if (r != null && HttpStatus.UNAUTHORIZED.value() == (Integer) (r.get("code"))) {
             throw new RRException((String) r.get("msg"), (Integer) r.get("code"));
         }
         String jsonString = null;

huimv-smart-management/src/main/resources/application.properties

@@ -1,3 +1,4 @@
 # \u73AF\u5883 dev|test|prod
 spring.profiles.active=dev
-user.info.url=http://192.168.1.44:88/api/sys/user/info
+user.info.url=http://192.168.1.44:88/api/sys/user/info
+local.test.url=http://115.238.57.190:8020/pig/

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

@@ -19,7 +19,7 @@
           pigsty.id,
           pigsty.number,
           pigsty.farm_id,
-          employee.name feederName
+          employee.name feederName,
           employee.id feederId
         from mgt_pigsty pigsty
          JOIN mgt_farm farm ON pigsty.farm_id = farm.id