[核查模块] 增加detail接口的地区现实

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckDetailVo.java

@@ -87,6 +87,9 @@ public class CheckDetailVo {
      */
     @ApiModelProperty(value = "核查单位")
     private String checkUnit;
+
+    @ApiModelProperty(value = "核查地区")
+    private String checkArea;
     /**
      * 应查数量
      */

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -12,10 +12,12 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.user.base.enums.AuExample;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.dao.UserDao;
 import com.tykj.dev.device.user.subject.entity.User;
+import com.tykj.dev.device.user.subject.service.AuService;
 import com.tykj.dev.misc.base.BeanHelper;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.exception.ApiException;
@@ -59,6 +61,9 @@ public class ObjTransUtil {
     @Autowired
     private TaskService taskService;
 
+    @Autowired
+    private AuService auService;
+
     @Autowired
     private TaskDao taskDao;
 
@@ -285,6 +290,10 @@ public class ObjTransUtil {
         detailVo.setDevInLibrary(inLibVoList);
         detailVo.setDevNotInLibrary(notInLibVoList);
 
+        String unitName = detailDo.getCheckUnit();
+        String areaName = auService.findOne(AuExample.UnitName, unitName).getName();
+        detailVo.setCheckArea(areaName);
+
         return detailVo;
 
     }

dev-union/pom.xml

@@ -377,6 +377,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

dev-union/src/main/java/com/tykj/dev/union/HealthConfig.java

+package com.tykj.dev.union;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * HealthConfig.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2020/11/3 at 3:44 下午
+ */
+@EnableAutoConfiguration(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
+@Configuration
+public class HealthConfig {
+}