Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/pom.xml

@@ -13,6 +13,11 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>com.amosframework.boot</groupId>
+			<artifactId>amos-boot-module-common-api</artifactId>
+			<version>${amos-biz-boot.version}</version>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 			<exclusions>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -67,7 +67,7 @@ public class OrgUsrController extends BaseController {
 
     @Autowired
     EmqKeeper emqKeeper;
-    @Value("${jcs.company.topic.delete}")
+    @Value("${jcs.company.topic.delete:jcs/company/topic/delete}")
     private String airportDeleteTopic;
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -99,7 +99,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     IMaintenanceCompanyService maintenanceCompanyService;
     @Autowired
     FireStationServiceImpl fireStationServiceImpl;
-    @Value("${jcs.company.topic.add}")
+    @Value("${jcs.company.topic.add:jcs/company/topic/add}")
     private String airportAddTopic;
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/pom.xml

@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.amosframework.boot</groupId>
-			<artifactId>amos-boot-module-common-api</artifactId>
+			<artifactId>amos-boot-module-common-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
 		<dependency>

amos-boot-system-latentdanger/pom.xml

@@ -14,11 +14,6 @@
     <dependencies>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-latentdanger-api</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-latentdanger-biz</artifactId>
             <version>1.0.0</version>
             <scope>compile</scope>

amos-boot-system-latentdanger/src/main/java/com/yeejoin/amos/LatentDangerApplication.java

@@ -48,7 +48,7 @@ import java.net.UnknownHostException;
 @ComponentScan(value = {"org.typroject", "com.yeejoin.amos"}, excludeFilters = {
 		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {JsonSerializerManage.class})})
 @MapperScan(basePackages = {"com.yeejoin.amos.latentdanger.business.dao.mapper", "org.typroject.tyboot.core.auth.face" +
-        ".orm.dao", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
+        ".orm.dao", "com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 public class LatentDangerApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(LatentDangerApplication.class);

amos-boot-system-latentdanger/src/main/resources/application-dev.properties

@@ -95,4 +95,5 @@ control.fegin.name=JCS-API-CONTROL
 supervision.feign.name=AMOS-SUPERVISION-API
 jcs.fegin.name=JCS
 
-onSite.confirm.roleName=Person_charge_unit_fire_protection_supervision_inspection
+onSite.confirm.roleName=Person_charge_unit_fire_protection_supervision_inspection
\ No newline at end of file
+sodFireProtection.confirm.roleName=Safety_Operation_Department_fire_protection
\ No newline at end of file