Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

@@ -25,6 +25,7 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
     //List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
+  @UserEmpower(field ={},dealerField ={"hygf_personnel_business.amos_unit_org_code","hygf_personnel_business.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
   List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PowerStationServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,6 +132,7 @@ public class PowerStationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "电站审核",   notes = "电站审核")
 	@PostMapping(value = "/powerStationExamine")
+	@GlobalTransactional
 	public ResponseModel<String> powerStationExamine(@RequestParam(value = "pageId") long pageId,
 														 			@RequestParam(value = "nodeCode") String nodeCode,
 													 				@RequestParam(value = "stationId") String stationId,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -261,6 +262,7 @@ public class UnitInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/unitRegister")
 	@ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")
+    @GlobalTransactional
 	public ResponseModel<UnitRegisterDto> save(@RequestBody UnitRegisterDto model) {
 		try {
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -233,7 +233,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	}
 
 	@Override
-	@GlobalTransactional
 	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
 			String planInstanceId, Map<String, Object> kv) {
 		String meg = "";

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -356,6 +356,9 @@ public class SurveyInformationServiceImpl
             powerStation.setPromoter(basicGridAcceptance.getPromoter());
             powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
             powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
+            powerStation.setTechnologyStatus("");
+            powerStation.setDesignStatus("");
+            powerStation.setBusinessStatus("");
 
             powerStationService.savePowerStation(powerStation, true, powerStation.getOwnersName(), "");
             //

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -245,3 +245,9 @@ spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
+## 47环境 排除es报错引进无用配置 业务未实际使用es
+spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

@@ -70,4 +70,6 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
     List<StationQrCodeStatistics> getPersonStatistics();
 
     Map<String, Object> getPersonDetailInfoByObjectId(String objectId);
+
+    List<Map<String, Object>> selectJobNumIsExist(String jobNum);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -193,6 +193,13 @@
 
     </select>
 
+    <select id="selectJobNumIsExist" resultType="java.util.Map">
+    select * from auth_login_info
+    where
+        LOGIN_ID = #{jobNum}
+    </select>
+    
+    
     <select id="getPersonYardStatistics" resultType="java.util.Map">
         SELECT
             a.qrcode_color as qrCodeColor,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
@@ -172,6 +173,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         PersonUser personUser = model.getPersonUser();
         // 获取人员账号信息
         PersonAccount personAccount = model.getPersonAccount();
+        List<Map<String, Object>> maps = personBasicMapper.selectJobNumIsExist(personAccount.getJobNumber());
+        if (CollectionUtils.isNotEmpty(maps) || maps.size()> 0){
+            throw new BadRequest("工号已存在");
+        }
+
         personUser.setPhone(personAccount.getPhoneNum());
         // 人员基础信息
         PersonBasic personBasic = new PersonBasic();