Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -75,9 +75,9 @@ public class MetaHandler implements MetaObjectHandler {
             this.setFieldValByName("recDate", currentDate, metaObject);
         }
         //以下为装备中转移过来的
-        if (isExistField("userId", entity)) {
-            this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
-        }
+//        if (isExistField("userId", entity)) {
+//            this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
+//        }
         if (isExistField("creatorId", entity)) {
             this.setFieldValByName("creatorId", Long.valueOf(agencyUserModel.getUserId()), metaObject);
         }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -504,8 +504,9 @@ GROUP BY
             `cb_org_usr` u
             LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr
         <where>
+           u. is_delete = 0
             <if test="id != null and id != ''">
-                u.amos_org_id = #{id}
+                AND u.amos_org_id = #{id}
             </if>
             <if test="type != null and type != ''">
                 AND u.biz_org_type = #{type}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/UserCar.java

@@ -28,4 +28,6 @@ public class UserCar extends BaseEntity {
     private String carNum;
 	@TableField("car_id")
     private Long carId;
+    @TableField("team_id")
+    private String teamId;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IUserCarService.java

@@ -12,6 +12,7 @@ public interface IUserCarService {
 
 
     UserCar selectByAmosUserId(Long id);
+    UserCar selectByCarId(Long id);
     List<UserCar> selectList();
     String selectListid();
     void add(UserCar userCar);

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1377,6 +1377,10 @@ public class CommandController extends BaseController {
             map.put("data", null);
             return ResponseHelper.buildResponse(null);
         }
+
+        if(teamId==null){
+            return ResponseHelper.buildResponse(null);
+        }
         ResponseModel<Page<CarInfoDto>> data = equipFeignClient.equipmentCarList(teamId, name, code, pageNum, pageSize, id, isNo);
         List<CarInfoDto> array=null;
         if(data != null && data.getResult()!=null){
@@ -1422,7 +1426,10 @@ public class CommandController extends BaseController {
         AgencyUserModel agencyUserModel = getUserInfo();
         userCar.setAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
         userCar.setAmosUserName(agencyUserModel.getRealName());
+
         if ("1".equals(type)) {
+            Firefighters orgUsr= firefightersService.selectByAmosOrgId(Long.valueOf(agencyUserModel.getUserId()));
+            userCar.setTeamId(orgUsr.getFireTeamId()+"");
             userCarService.add(userCar);
         } else {
             userCarService.delete(userCar);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -33,6 +33,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -279,6 +280,7 @@ public class CarController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @Transactional
     @ApiOperation(httpMethod = "PUT", value = "编辑车辆信息(<font color='blue'>release</font>)", notes = "编辑车辆信息")
     @PostMapping(value = "/update", produces = "application/json;charset=UTF-8")
     public Car updateCar(@ApiParam(value = "车辆对象", required = true) @RequestBody Car car) {
@@ -295,6 +297,10 @@ public class CarController extends AbstractBaseController {
 //		Set<CarProperty> carpList = carRequest.getCarPropertyList();
 //		carInstance = iCarService.saveCar(getUserInfo(), carInstance, carInfo, carpList);
         // saveFile(carInstance);视频图片文件后期统一处理
+
+        //用来解绑车辆
+        jcsFeign.getUserCar(car.getId(),car.getTeamId());
+
         EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
         Car oldCar = iCarService.getById(car.getId());
         Car car1 = iCarService.updateOneById(car);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmController.java

@@ -135,6 +135,10 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
     public ResponseModel getAlarmPage(int pageNum, int pageSize, AlarmDTO dto) {
         dto.setStatus("1");
         Page page = new Page(pageNum, pageSize);
+        if (dto.getStartDate() != null && dto.getEndDate() != null){
+            dto.setStartDate(dto.getStartDate().split(" ")[0]+" 00:00:00");
+            dto.setEndDate(dto.getEndDate().split(" ")[0]+" 23:59:59");
+        }
         Page<EquipSpecificAlarmDTO> pageBean = iEquipmentSpecificAlarmService.getAlarmPage(page, dto);
         return CommonResponseUtil.success(pageBean);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -11,6 +11,7 @@ import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.utils.SpringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -86,6 +87,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     IFireFightingSystemService fireFightingSystemService;
     @Autowired
     IUploadFileService uploadFileService;
+    @Lazy
     @Autowired
     IEquipmentSpecificSerivce equipmentSpecificSerivce;
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -81,6 +81,16 @@ public interface JcsFeign {
             @RequestParam(value = "type", required = false) String type,
             @RequestParam(value = "method", required = false) String method);
 
+
+    @RequestMapping(value = "/firefighters/getUserCar/{carId}/{teamId}", method = RequestMethod.GET, consumes = "application/json")
+    void getUserCar(
+            @PathVariable(value = "carId") Long carId,
+            @PathVariable(value = "teamId") String teamId);
+
+
+
+
+
     /**
      * <pre>
      * 根据值班区域ID查询当前值班人

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -303,11 +303,26 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //前端的address中携带了经纬度,后台切割保存
         if (map.containsKey("address") && map.get("address") != null){
             String address = map.get("address").toString();
-            if (address.contains("@")){
-                String[] addresses = address.split("@");
-                map.put("address",addresses[0]);
+            String[] addressData = address.split("@address@");
+            if (addressData.length > 1) {
+                map.put("address",addressData[0]);
+                JSONObject langLatObj = JSON.parseObject(addressData[1]);
+                if (StringUtils.isNotEmpty(langLatObj.getString("longitude"))) {
+                    map.put("longitude",langLatObj.getString("longitude"));
+                }
+                if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) {
+                    map.put("latitude",langLatObj.getString("latitude"));
+                }
             }
+
+//            if (address.contains("@")){
+//                String[] addresses = address.split("@");
+//                map.put("address",addresses[0]);
+//                map.put("longitude",addresses[0]);
+//                map.put("latitude",addresses[0]);
+//            }
         }
+
         Map<String, Object> formKeyMap = iFormInstanceService.createByMap(groupCode, companyCode, map);
         if (formKeyMap.get(instanceId) != null) {
             //2.保存图片

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -176,6 +176,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             }
 
             ent.setUpdateDate(new Date());
+            ent.setConfirmDate(new Date());
             int i = 0 ;
             if (ent.getIsBatch() == 0){
                i = equipmentSpecificAlarmLogMapper.updateById(ent);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -199,7 +199,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
 
     @Override
     public org.springframework.data.domain.Page<AlarmListDataVO> listAlarmsPage(CommonPageInfoParam param) {
-        Page page = new Page(param.getPageNumber(), param.getPageSize());
+        Page page = new Page(param.getPageNumber()-1,(param.getPageNumber()-1) * param.getPageSize());
         Page<Map<String, Object>> mybatisResult = this.baseMapper.pageAlarmsInfo(page, param);
         List<AlarmListDataVO> res = new ArrayList<>();
         if (mybatisResult.getSize() > 0) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -12,6 +12,8 @@ import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
+import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -104,7 +106,8 @@ public class FirefightersController extends BaseController {
 
     @Value("${auth-key-fire-fighters:fire_fighters_info}")
     private String authKey;
-
+    @Autowired
+    IUserCarService userCarService;
 
     /**
      * 新增消防队员
@@ -193,6 +196,27 @@ public class FirefightersController extends BaseController {
     }
 
 
+
+
+
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUserCar/{carId}/{teamId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "POST", value = "获取绑定车辆", notes = "获取绑定车辆")
+    @Transactional
+    public void getUserCar(@PathVariable Long carId,@PathVariable String teamId) {
+        try {
+            UserCar userCar =userCarService.selectByCarId(carId);
+            if(userCar!=null&&!userCar.getTeamId().equals(teamId)){
+                userCarService.delete(userCar);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("系统异常");
+        }
+
+    }
+
+
+
     /**
      * 修改消防队员
      *
@@ -205,6 +229,14 @@ public class FirefightersController extends BaseController {
     public ResponseModel<Object> updateByIdFirefighters(HttpServletRequest request,
                                                         @RequestBody FirefightersInfoDto firefighters) {
         try {
+
+            //判断此消防人员所属队伍是否变换，
+            //获取用户已绑定车辆id、
+            UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId()));
+            if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){
+                userCarService.delete(userCar);
+            }
+
             Firefighters firefighter = firefighters.getFirefighters();
             // BUG2168 居住地户籍所在地为空判断 bykongfm
             if (firefighter.getResidenceDetails() != null) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/UserCarServiceImpl.java

@@ -38,6 +38,13 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
     }
 
     @Override
+    public UserCar selectByCarId(Long id) {
+        QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("car_id", id);
+        return UserCarMapper.selectOne(queryWrapper);
+    }
+
+    @Override
     public List<UserCar> selectList() {
         return this.list();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java

@@ -150,25 +150,77 @@ public class GroupController extends AbstractBaseController{
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
 
 		ReginParams reginParams = getSelectedOrgInfo();
-		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 
+		String companyId = reginParams.getCompany().getSequenceNbr().toString();
+
+		// 获取部门及人员信息
+		res = getDeptAndUser(companyId);
+		//	String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 		// 获取部门及人员信息
-		res = getDeptAndUser(bizOrgCode);
+	//	res = getDeptAndUser(bizOrgCode);
 
 		return CommonResponseUtil.success(res);
 	}
 
+
 	/**
 	 * 根据公司id获取部门及人员信息
 	 * @param companyId
 	 * @return
 	 */
+	private List<LinkedHashMap<String, Object>> getDeptAndUser( String companyId){
+
+		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
+		CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
+		String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
+		List children = (List) companyModel.getChildren();
+
+		for (int i = 0; i < children.size(); i++) {
+			Map<String, Object> map = (LinkedHashMap) children.get(i);
+			LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
+			if("其他".equals((map.get("departmentName").toString()))){
+				dept.put("id", "-1");
+				dept.put("key", "-1");
+				dept.put("value", "-1");
+				dept.put("state", "close");
+				dept.put("label", "其他");
+				dept.put("title", "其他");
+				dept.put("name", "其他");
+				List userModelList = (List) map.get("userModelList");
+				dept.put("children", getUserModelList(userModelList, "-1"));
+			}else{
+				dept.put("id", map.get("sequenceNbr"));
+				dept.put("key", map.get("sequenceNbr"));
+				dept.put("value", map.get("sequenceNbr"));
+				dept.put("state", "open");
+				dept.put("orgCode", loginOrgCode+"-"+map.get("sequenceNbr"));
+				dept.put("label", map.get("departmentName"));
+				dept.put("title", map.get("departmentName"));
+				dept.put("name", map.get("departmentName"));
+				//人员集合
+				List userModelList = (List) map.get("userModelList");
+				dept.put("children", getUserModelList(userModelList, map.get("sequenceNbr")));
+			}
+			dept.put("type", "department");
+			dept.put("writeable", 0);
+			res.add(dept);
+		}
+		return res;
+	}
+
+
+
+	/**
+	 * 根据公司id获取部门及人员信息
+	 * @param companyId
+	 * @return
+	 *//*
 	private List<LinkedHashMap<String, Object>> getDeptAndUser( String bizOrgCode){
 
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
-	//	CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
-	//	String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
-	//	List children = (List) companyModel.getChildren();
+	//CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
+//	String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
+	//List children = (List) companyModel.getChildren();
 		ResponseModel<Object> byOrgCode = jcsFeignClient.getByOrgCode(bizOrgCode);
 		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("OrgCode",bizOrgCode);
@@ -185,9 +237,7 @@ public class GroupController extends AbstractBaseController{
 					o.put("userModelList",userList);
 				}
 			}
-		}));
-
-
+		}));*//*
 		for (int i = 0; i < orgUsresult.size(); i++) {
 			Map<String, Object> map = (LinkedHashMap) orgUsresult.get(i);
 			if (map.containsKey("userModelList") && map.containsKey("bizOrgName") && !map.get("bizOrgName").equals("")){
@@ -222,7 +272,7 @@ public class GroupController extends AbstractBaseController{
 			}
 		}
 		return res;
-	}
+	}*/
 
 	/**
 	 * 部门人员转换
@@ -237,7 +287,22 @@ public class GroupController extends AbstractBaseController{
 		for(int i = 0; i < userModelList.size(); i++){
 			Map<String, Object> map = (LinkedHashMap) userModelList.get(i);
 			LinkedHashMap<String, Object> user = new LinkedHashMap<>();
-			if (map.get("amosOrgId")!= null && map.get("bizOrgName")!= null ){
+			if (set.add(map.get("userId").toString())) {
+				user.put("id", map.get("sequenceNbr"));
+				if("-1".equals(deptId)){
+					user.put("key", map.get("sequenceNbr") + "-1");
+					user.put("value", map.get("userId").toString() + "@" + "-1");
+				}else{
+					user.put("key", map.get("sequenceNbr") + deptId.toString());
+					user.put("value", map.get("userId").toString() + "@" + deptId.toString());
+				}
+				user.put("label", map.get("realName"));
+				user.put("title", map.get("realName"));
+				user.put("name", map.get("realName"));
+				user.put("userId", map.get("userId"));
+				res.add(user);
+			}
+/*			if (map.get("amosOrgId")!= null && map.get("bizOrgName")!= null ){
 				if (set.add(map.get("amosOrgId").toString())) {
 					user.put("id", map.get("sequenceNbr"));
 					if("-1".equals(deptId)){
@@ -253,7 +318,7 @@ public class GroupController extends AbstractBaseController{
 					user.put("userId", map.get("amosOrgId"));
 					res.add(user);
 				}
-			}
+			}*/
 		}
 
 		return res;

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -613,10 +613,10 @@
             <if test='dto.createDate != null and dto.createDate == "1"'>
                 AND wlesa.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
             </if>
-           <if test='createDate != null and createDate == "7"'>
+           <if test='dto.createDate != null and dto.createDate == "7"'>
                 AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ), ' 23:59:59' )
             </if>
-            <if test='createDate != null and createDate == "30"'>
+            <if test='dto.createDate != null and dto.createDate == "30"'>
                  AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ),' 23:59:59' )
             </if>
             <if test="dto.createDate != null and dto.createDate.length() > 7">
@@ -946,7 +946,7 @@
                 and d.fireEquipmentCode like CONCAT('%', #{dto.fireEquipmentCode}, '%' )
             </if>
             <if test='dto.startDate != null and dto.startDate != "" and dto.endDate  != null and dto.endDate != ""'>
-                DATE_FORMAT(d.createDate, '%Y-%m-%d' ) BETWEEN DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d' ) and DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d' )
+                and d.createDate BETWEEN #{dto.startDate} and #{dto.endDate}
             </if>
         </where>
         ORDER BY

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2828,5 +2828,20 @@
         </sql>
     </changeSet>
 
+    <changeSet author="tw" id="2022-03-25">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="jc_user_car" columnName="team_id"/>
+            </not>
+        </preConditions>
+        <comment>jc_user_car add column team_id  队伍id</comment>
+        <sql>
+            ALTER TABLE jc_user_car ADD team_id varchar(100) NULL COMMENT '队伍id';
+        </sql>
+    </changeSet>
+
+
+
+
 </databaseChangeLog>