haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改

This commit is contained in:
cwchen 2024-04-24 15:53:06 +08:00
parent e50241a467
commit be9ca92347
7 changed files with 32 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
View File

@ -61,9 +61,9 @@ public class HumanServiceImpl implements HumanService {
String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1); String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) { if (StringUtils.isNotEmpty(data)) {
String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2); String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value); vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
}else{ }else{
vo.setStatus("离场"); vo.setStatus("出");
} }
} }
} catch (Exception e) { } catch (Exception e) {

4
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java
View File

@ -156,9 +156,9 @@ public class TeamServiceImpl implements TeamService {
String data = humanManageMapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1); String data = humanManageMapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) { if (StringUtils.isNotEmpty(data)) {
String value = humanManageMapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2); String value = humanManageMapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value); vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
} else { } else {
vo.setStatus("离场"); vo.setStatus("出");
} }
String decryptIdNumber = AesCbcUtils.decrypt(vo.getIdNumber()); String decryptIdNumber = AesCbcUtils.decrypt(vo.getIdNumber());
if (decryptIdNumber != null) { if (decryptIdNumber != null) {

43
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
View File

@ -35,18 +35,8 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_pro_bd UPDATE tb_pro_bd SET bd_name = #{bdName},bd_code = #{bdCode},bd_ip = #{bdIp},bd_type = #{bdType},
<set> type_code = #{typeCode},gt_id = #{gtId},bid_code = #{bidCode},bind_time = #{bindTime} WHERE id = #{id}
<if test="bdName != null and bdName != ''">bd_name = #{bdName},</if>
<if test="bdCode != null and bdCode != ''">bd_code = #{bdCode},</if>
<if test="bdIp != null and bdIp != ''">bd_ip = #{bdIp},</if>
<if test="bdType != null and bdType != ''">bd_type = #{bdType},</if>
<if test="typeCode != null and typeCode != ''">type_code = #{typeCode},</if>
<if test="gtId != null and gtId != ''">gt_id = #{gtId},</if>
<if test="bidCode != null and bidCode != ''">bid_code = #{bidCode},</if>
<if test="bindTime != null and bindTime != ''">bind_time = #{bindTime},</if>
</set>
WHERE id = #{id}
</if> </if>
</insert> </insert>
<!--新增/修改 边带子设备--> <!--新增/修改 边带子设备-->
@ -85,20 +75,9 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_bd_device UPDATE tb_bd_device SET device_code = #{deviceCode},devic_type = #{deviceType},status = #{status},bd_code = #{bdCode},
<set> device_name = #{deviceName},update_time = #{updateTime},device_model = #{deviceModel},bd_id = #{bdId},area_id = #{areaId},
<if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if> gt_id = #{gtId} WHERE device_id = #{deviceId}
<if test="deviceType != null and deviceType != ''">devic_type = #{deviceType},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="bdCode != null and bdCode != ''">bd_code = #{bdCode},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="updateTime != null and updateTime != ''">update_time = #{updateTime},</if>
<if test="deviceModel != null and deviceModel != ''">device_model = #{deviceModel},</if>
<if test="bdId != null and bdId != ''">bd_id = #{bdId},</if>
<if test="areaId != null and areaId != ''">area_id = #{areaId},</if>
<if test="gtId != null and gtId != ''">gt_id = #{gtId},</if>
</set>
WHERE device_id = #{deviceId}
</if> </if>
</insert> </insert>
<!--边带设备绑定记录--> <!--边带设备绑定记录-->
@ -143,16 +122,8 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_device_detail UPDATE tb_device_detail SET device_id = #{deviceId},mode_name = #{modeName},max_value = #{maxValueData},
<set> min_valu = #{minValueData},data_type = #{dataType},device_code = #{deviceCode} WHERE id = #{id}
<if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
<if test="modeName != null and modeName != ''">mode_name = #{modeName},</if>
<if test="maxValueData != null and maxValueData != ''">max_value = #{maxValueData},</if>
<if test="minValueData != null and minValueData != ''">min_valu = #{minValueData},</if>
<if test="dataType != null and dataType != ''">data_type = #{dataType},</if>
<if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
</set>
WHERE id = #{id}
</if> </if>
</insert> </insert>
<!--新增/修改 设备采集信息表--> <!--新增/修改 设备采集信息表-->

17
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
View File

@ -35,20 +35,9 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE t_team_people UPDATE t_team_people SET team_id = #{teamId},user_name = #{userName},id_number = #{idNumber},phone = #{phone},
<set> user_type = #{userType},person_type = #{personType},project_dep_name = #{projectDepName},dept_name = #{deptName},
<if test="teamId != null and teamId != ''">team_id = #{teamId},</if> sex = #{sex} WHERE user_id= #{userId}
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="idNumber != null and idNumber != ''">id_number = #{idNumber},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="userType != null and userType != ''">user_type = #{userType},</if>
<if test="status != null and status!=''">#{status},</if>
<if test="personType != null and personType!=''">person_type = #{personType},</if>
<if test="projectDepName != null and projectDepName!=''">project_dep_name = #{projectDepName},</if>
<if test="deptName != null and deptName!=''">dept_name = #{deptName},</if>
<if test="sex != null and sex!=''">sex = #{sex},</if>
</set>
WHERE user_id= #{userId}
</if> </if>
</insert> </insert>
<!--保存人员照片资源--> <!--保存人员照片资源-->

36
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
View File

@ -63,33 +63,11 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_project UPDATE tb_project SET sign_code = #{signCode},bid_code = #{bidCode},pro_code = #{proCode},
<set> pro_name = #{proName},pro_cost = #{proCost},sg_unit = #{sgUnit},jl_unit = #{jlUnit},pro_type = #{proType},
<if test="userId != null">user_id = #{userId},</if> pro_scale = #{proScale},manager = #{manager},now_gx = #{nowGx},status = #{status},plan_start_time = #{planStartTime},
<if test="signCode != null and signCode != ''">sign_code = #{signCode},</if> plan_end_time = #{planEndTime},start_time = #{startTime},end_time = #{endTime},org = #{org},bid_type = #{bidType},
<if test="bidCode != null and bidCode != ''">bid_code = #{bidCode},</if> sg_manage = #{sgManage},jl_manage = #{jlManage},sub_type = #{subType},tc_date = #{tcDate} WHERE pro_id = #{proId}
<if test="proCode != null and proCode != ''">pro_code = #{proCode},</if>
<if test="proName != null and proName != ''">pro_name = #{proName},</if>
<if test="proCost != null and proCost != ''">pro_cost = #{proCost},</if>
<if test="sgUnit != null and sgUnit != ''">sg_unit = #{sgUnit},</if>
<if test="jlUnit != null and jlUnit != ''">jl_unit = #{jlUnit},</if>
<if test="proType != null and proType != ''">pro_type = #{proType},</if>
<if test="proScale != null and proScale != ''">pro_scale = #{proScale},</if>
<if test="manager != null and manager != ''">manager = #{manager},</if>
<if test="nowGx != null and nowGx != ''">now_gx = #{nowGx},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="planStartTime != null and planStartTime != ''">plan_start_time = #{planStartTime},</if>
<if test="planEndTime != null and planEndTime != ''">plan_end_time = #{planEndTime},</if>
<if test="startTime != null and startTime != ''">start_time = #{startTime},</if>
<if test="endTime != null and endTime != ''">end_time = #{endTime},</if>
<if test="org != null and org != ''">org = #{org},</if>
<if test="bidType != null and bidType!=''">bid_type = #{bidType},</if>
<if test="sgManage != null and sgManage!=''">sg_manage = #{sgManage},</if>
<if test="jlManage != null and jlManage!=''">jl_manage = #{jlManage},</if>
<if test="subType != null and subType!=''">sub_type = #{subType},</if>
<if test="tcDate != null and tcDate!=''">tc_date = #{tcDate},</if>
</set>
WHERE pro_id = #{proId}
</if> </if>
</insert> </insert>
<!--保存文件资源--> <!--保存文件资源-->
@ -207,7 +185,9 @@
sd.dict_name AS status, sd.dict_name AS status,
tp.bid_code AS bidCode, tp.bid_code AS bidCode,
tp.sign_code AS signCode, tp.sign_code AS signCode,
tp.pro_code AS proCode tp.pro_code AS proCode,
tp.sg_manage AS sgManage,
tp.jl_manage AS jlManage
FROM tb_project tp FROM tb_project tp
LEFT JOIN sys_build sb ON tp.org = sb.org_id LEFT JOIN sys_build sb ON tp.org = sb.org_id
LEFT JOIN sys_dict sd ON sd.dict_code = tp.status AND sd.del_flag = 0 LEFT JOIN sys_dict sd ON sd.dict_code = tp.status AND sd.del_flag = 0

45
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml
View File

@ -43,24 +43,10 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_jj_project UPDATE tb_jj_project SET pro_name = #{proName},pro_no = #{proNo},org_id = #{orgId},vlotage = #{vlotage},
<set> pro_type = #{proType},construction_nature = #{constructionNature},plan_nature = #{planNature},line = #{line},
<if test="proName != null and proName != ''">pro_name = #{proName},</if> power = #{power},plan_start_time = #{planStartTime},plan_end_time = #{planEndTime},start_time = #{startTime},
<if test="proNo != null and proNo != ''">pro_no = #{proNo},</if> end_time = #{endTime},tc_time = #{tcTime} WHERE id = #{id}
<if test="orgId != null and orgId != ''">org_id = #{orgId},</if>
<if test="vlotage != null and vlotage != ''">vlotage = #{vlotage},</if>
<if test="proType != null and proType != ''">pro_type = #{proType},</if>
<if test="constructionNature != null and constructionNature != ''">construction_nature = #{constructionNature},</if>
<if test="planNature != null and planNature != ''">plan_nature = #{planNature},</if>
<if test="line != null and line != ''">line = #{line},</if>
<if test="power != null and power != ''">power = #{power},</if>
<if test="planStartTime != null and planStartTime != ''">plan_start_time = #{planStartTime},</if>
<if test="planEndTime != null and planEndTime != ''">plan_end_time = #{planEndTime},</if>
<if test="startTime != null and startTime != ''">start_time = #{startTime},</if>
<if test="endTime != null and endTime != ''">end_time = #{endTime},</if>
<if test="tcTime != null and tcTime != ''">tc_time = #{tcTime},</if>
</set>
WHERE id = #{id}
</if> </if>
</insert> </insert>
<!--新增/修改单项工程--> <!--新增/修改单项工程-->
@ -107,25 +93,10 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_sign_project UPDATE tb_sign_project SET single_name = #{singleName},signle_no = #{signleNo},wbs_code = #{wbsCode},project_no = #{proNo},
<set> single_desc = #{singleDesc},vol_level = #{volLevel},line_length = #{lineLength},subs_cap = #{subsCap},pro_type = #{proType},
<if test="singleName != null and singleName != ''">single_name = #{singleName},</if> subs_type = #{subsType},estimate_type = #{estimateType},org_id = #{orgId},start_date = #{startDate},end_date = #{endDate},
<if test="signleNo != null and signleNo != ''">signle_no = #{signleNo},</if> complete_date = #{completeDate} WHERE id = #{id}
<if test="wbsCode != null and wbsCode != ''">wbs_code = #{wbsCode},</if>
<if test="proNo != null and proNo != ''">project_no = #{proNo},</if>
<if test="singleDesc != null and singleDesc != ''">single_desc = #{singleDesc},</if>
<if test="volLevel != null and volLevel != ''">vol_level = #{volLevel},</if>
<if test="lineLength != null and lineLength != ''">line_length = #{lineLength},</if>
<if test="subsCap != null and subsCap != ''">subs_cap = #{subsCap},</if>
<if test="proType != null and proType != ''">pro_type = #{proType},</if>
<if test="subsType != null and subsType != ''">subs_type = #{subsType},</if>
<if test="estimateType != null and estimateType != ''">estimate_type = #{estimateType},</if>
<if test="orgId != null and orgId != ''">org_id = #{orgId},</if>
<if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
<if test="endDate != null and endDate != ''">end_date = #{endDate},</if>
<if test="completeDate != null and completeDate != ''">complete_date = #{completeDate},</if>
</set>
WHERE id = #{id}
</if> </if>
</insert> </insert>
<!--删除项目--> <!--删除项目-->

12
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml
View File

@ -26,16 +26,8 @@
</trim> </trim>
</if> </if>
<if test="type == 2"> <if test="type == 2">
UPDATE tb_work_team UPDATE tb_work_team SET team_name = #{teamName},team_leader = #{teamLeader},bid_code = #{bidCode},team_leader_phone = #{teamLeaderPhone},
<set> id_number = #{idNumber},status = #{status} WHERE team_id = #{teamId}
<if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
<if test="teamLeader != null and teamLeader != ''">team_leader = #{teamLeader},</if>
<if test="bidCode != null and bidCode != ''">bid_code = #{bidCode},</if>
<if test="teamLeaderPhone != null and teamLeaderPhone != ''">team_leader_phone = #{teamLeaderPhone},</if>
<if test="idNumber != null and idNumber != ''">id_number = #{idNumber},</if>
<if test="status != null and status != ''">status = #{status},</if>
</set>
WHERE team_id = #{teamId}
</if> </if>
</insert> </insert>
<!--添加班组人员--> <!--添加班组人员-->