wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

多余代码删除

pull/4/head
zhangyanli 2024-02-04 17:37:52 +08:00
parent 1825eba1b7
commit 88efa3f0ea
4 changed files with 0 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java
View File

@ -492,185 +492,6 @@ public class CustomController extends BaseController {
return map; return map;
} }
// /**列表
// * @param page
// * @throws Exception
// */
// @RequestMapping(value="/checkList")
// @ResponseBody
// @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "列表")
// public Object checkList(Page page) throws Exception{
// Map<String,Object> map = new HashMap<String,Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// PageData isRest = this.getPageData();
// isRest.put("ISREST", "1");
// isRest.put("USER_ID", Jurisdiction.getUSER_ID());
// isRest.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
// List<PageData> restList = offdutyService.listAll(isRest);
// if(restList != null && restList.size() > 0) {
// // 休假中
// map.put("ISREST", "1");
// } else {
// // 正常工作
// map.put("ISREST", "0");
// }
// PageData npd = new PageData();
// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
//// pd.put("POST_ID", Jurisdiction.getPOST_ID()); //岗位
// pd.put("USER_ID", Jurisdiction.getUSER_ID());
// String indexType = pd.getString("indexType"); //关键词检索条件
// if(Tools.notEmpty(indexType))pd.put("indexType", indexType.trim());
// if("1".equals(indexType)) {
// npd.put("STATUS", "0");
// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID();
// npd.put("DEPARTMENT_ID", DEPARTMENT_ID);
// } else if("2".equals(indexType)) {
//
// npd.put("STATUS", "1");
// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID();
// npd.put("DEPARTMENT_ID", DEPARTMENT_ID);
// } else {
// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID();
// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
// if(Jurisdiction.getIS_MAIN().equals("0")) {
// if(ids!=null && Tools.notEmpty(ids) && ids.lastIndexOf(",")>-1 ) {
// ids = ids.substring(0,ids.lastIndexOf(","));
// npd.put("DEPARTMENT_IDS", ids.split(","));
// }else {
// npd.put("DEPARTMENT_ID", DEPARTMENT_ID);
// }
// }
// }
//
// npd.put("orderUserId", Jurisdiction.getUSER_ID());
// String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
// if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim());
// String USERNAME = pd.getString("USERNAME"); //关键词检索条件
// if(Tools.notEmpty(USERNAME))npd.put("USERNAME", USERNAME.trim());
// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
// npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
// npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
// npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
// PageData cpd = new PageData();
// cpd = usersService.findById(pd);
// npd.put("ISLEADER", cpd.getString("ISLEADER"));
// if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){
// String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID");
// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
// ids=npd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去
// if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) {
// ids = ids.substring(0,ids.lastIndexOf(","));
// npd.put("DEPARTMENT_IDS", ids.split(","));
// }else {
// npd.put("DEPARTMENT_IDS", DEPARTMENT_ID);
// }
// }else{
// if(npd.getString("ISMAIN").equals("0")){
// npd.put("USER_ID",Jurisdiction.getUSER_ID());
// }
// }
// String DEPTIDS = pd.getString("DEPTIDS");
// if(Tools.notEmpty(DEPTIDS)) {
// String DEPT_IDS[] = DEPTIDS.split(",");
// npd.put("DEPT_IDS", DEPT_IDS);
// }
// npd.put("PERIOD",pd.getString("PERIOD"));
// npd.put("STATUS",pd.getString("STATUS"));
// npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL"));
// page.setPd(npd);
// List<PageData> varList = listmanagerService.checklistPage(page); //列出ListManager列表
// for (PageData list : varList) {
// String userId= list.getString("USER_ID");
// if(userId.equals(Jurisdiction.getUSER_ID())) {
// list.put("stateMy", "0");
// }else {
// list.put("stateMy", "1");
// }
//
// }
// map.put("varList", varList);
// map.put("page", page);
// map.put("result", errInfo);
// return map;
// }
// /**列表
// * @param page
// * @throws Exception
// */
// @RequestMapping(value="/recordList")
// @ResponseBody
// @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "列表")
// public Object recordList(Page page) throws Exception{
// Map<String,Object> map = new HashMap<String,Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// PageData npd = new PageData();
// pd = this.getPageData();
// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
//// pd.put("POST_ID", Jurisdiction.getPOST_ID()); //岗位
// pd.put("USER_ID", Jurisdiction.getUSER_ID());
// npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
// npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
// npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
// PageData cpd = new PageData();
// cpd = usersService.findById(pd);
// npd.put("ISLEADER", cpd.getString("ISLEADER"));
// if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){
// String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID");
// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
// ids=npd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去
// if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) {
// ids = ids.substring(0,ids.lastIndexOf(","));
// npd.put("DEPARTMENT_IDS", ids.split(","));
// }else {
// npd.put("DEPARTMENT_IDS", DEPARTMENT_ID);
// }
// }else {
// if(npd.getString("ISMAIN").equals("0")){
// npd.put("USER_ID",Jurisdiction.getUSER_ID());
// }
// }
// String DEPTIDS = pd.getString("DEPTIDS");
// if(Tools.notEmpty(DEPTIDS)) {
// String DEPT_IDS[] = DEPTIDS.split(",");
// npd.put("DEPT_IDS", DEPT_IDS);
// }
// String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
// if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim());
// String STARTTIME = pd.getString("STARTTIME"); //关键词检索条件
// if(Tools.notEmpty(STARTTIME))npd.put("STARTTIME", STARTTIME.trim() + " 00:00:00");
// String ENDTIME = pd.getString("ENDTIME"); //关键词检索条件
// if(Tools.notEmpty(ENDTIME))npd.put("ENDTIME", ENDTIME.trim() + " 23:59:59");
// npd.put("ISDELETE",pd.getString("ISDELETE"));
// npd.put("USERNAME",pd.getString("USERNAME"));
// npd.put("STATUS",pd.getString("STATUS"));
// npd.put("PERIOD",pd.getString("PERIOD"));
// npd.put("OVERTIME",pd.getString("OVERTIME"));
// npd.put("WORKSTATUS",pd.getString("WORKSTATUS"));
// npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL"));
// npd.put("TYPE",pd.getString("TYPE"));
// npd.put("HASHIDDEN",pd.getString("HASHIDDEN"));
// npd.put("RISKCHECKLISTTYPE",pd.getString("RISKCHECKLISTTYPE"));
// page.setPd(npd);
// List<PageData> varList = listmanagerService.recordList(page); //列出ListManager列表
// for (PageData list : varList) {
// String userId= list.getString("USER_ID");
// if(userId.equals(Jurisdiction.getUSER_ID())) {
// list.put("stateMy", "0");
// }else {
// list.put("stateMy", "1");
// }
// }
// map.put("varList", varList);
// map.put("page", page);
// map.put("result", errInfo);
// return map;
// }
/** /**
* 去修改页面获取数据 * 去修改页面获取数据
* *

25
src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java
View File

@ -1,25 +0,0 @@
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
import java.util.List;
public interface ListcheckstandarditemService {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
}

43
src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java
View File

@ -1,43 +0,0 @@
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper;
import com.zcloud.service.hiddenDangerCheckStandard.ListcheckstandarditemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 说明：清单管理
* 作者：luoxiaobao
* 时间：2020-12-30
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class ListcheckstandarditemServiceImpl implements ListcheckstandarditemService {
@Autowired
private ListCheckStandardItemMapper listCheckStandardItemMapper;
@Override
public void save(PageData pd)throws Exception {
listCheckStandardItemMapper.save(pd);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return listCheckStandardItemMapper.listAll(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
listCheckStandardItemMapper.delete(pd);
}
}

261
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml
View File

@ -1,261 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper">
<!--表名 -->
<sql id="tableName">
LISTCHECKSTANDARDITEM_ID
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.LISTCHECKSTANDARDITEM_ID,
f.LISTMANAGER_ID,
f.CUSTOM_ID,
f.CUSTOM_ITEM_ID,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.BAO_BAO_NUM
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
LISTCHECKSTANDARDITEM_ID,
LISTMANAGER_ID,
CUSTOM_ID,
CUSTOM_ITEM_ID,
CORPINFO_ID,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME,
ISDELETE,
BAO_BAO_NUM
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{LISTCHECKSTANDARDITEM_ID},
#{LISTMANAGER_ID},
#{RISKPOINT_ID},
#{RISKCHECKITEM_ID},
#{CORPINFO_ID},
#{CREATOR},
#{CREATTIME},
#{OPERATOR},
#{OPERATTIME},
#{ISDELETE},
#{BAO_BAO_NUM}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
LISTCHECKSTANDARDITEM_ID = #{LISTCHECKSTANDARDITEM_ID}
</delete>
<!-- &lt;!&ndash; 修改 &ndash;&gt;-->
<!-- <update id="edit" parameterType="pd">-->
<!-- update-->
<!-- <include refid="tableName"></include>-->
<!-- set-->
<!-- LISTMANAGER_ID = #{LISTMANAGER_ID},-->
<!-- RISKPOINT_ID = #{RISKPOINT_ID},-->
<!-- RISKCHECKITEM_ID = #{RISKCHECKITEM_ID},-->
<!-- CORPINFO_ID = #{CORPINFO_ID},-->
<!-- BAO_BAO_NUM = #{BAO_BAO_NUM},-->
<!-- LISTCHECKITEM_ID = LISTCHECKITEM_ID-->
<!-- where-->
<!-- LISTCHECKITEM_ID = #{LISTCHECKITEM_ID}-->
<!-- </update>-->
<!-- &lt;!&ndash; 通过ID获取数据 &ndash;&gt;-->
<!-- <select id="findById" parameterType="pd" resultType="pd">-->
<!-- select-->
<!-- <include refid="Field"></include>,-->
<!-- un.RISKUNITNAME,-->
<!-- po.POSITIONNAME,-->
<!-- id.PARTSNAME,-->
<!-- d5.BIANMA BIANMA5,-->
<!-- d5.NAME DNAME5,-->
<!-- r.RISK_DESCR,-->
<!-- chi.CHECK_CONTENT-->
<!-- from-->
<!-- <include refid="tableName"></include> f-->
<!-- left join BUS_RISK_CHECK_ITEM chi on chi.RISKCHECKITEM_ID=f.RISKCHECKITEM_ID-->
<!-- left join bus_riskpoint r on r.RISKPOINT_ID = f.RISKPOINT_ID-->
<!-- left join bus_riskunit un on un.RISKUNIT_ID = r.RISK_UNIT_ID-->
<!-- left join bus_riskpointposition po on po.RISKPOINTPOSITION_ID = r.RISK_POSITION_ID-->
<!-- left join bus_identificationparts id on id.IDENTIFICATIONPARTS_ID = r.IDENTIFICATION_ID-->
<!-- left join SYS_DICTIONARIES d5 on r.LEVELID = d5.BIANMA-->
<!-- where-->
<!-- f.LISTCHECKITEM_ID = #{LISTCHECKITEM_ID}-->
<!-- </select>-->
<!-- &lt;!&ndash; 列表 &ndash;&gt;-->
<!-- <select id="datalistPage" parameterType="page" resultType="pd">-->
<!-- select-->
<!-- <include refid="Field"></include>-->
<!-- from-->
<!-- <include refid="tableName"></include> f-->
<!-- where f.ISDELETE = '0'-->
<!-- <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;-->
<!-- and-->
<!-- (-->
<!-- &lt;!&ndash; 根据需求自己加检索条件-->
<!-- 字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')-->
<!-- or-->
<!-- 字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')-->
<!-- &ndash;&gt;-->
<!-- )-->
<!-- </if>-->
<!-- </select>-->
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>,
bl.TASK_TYPE,
blsd.NAME as TASK_TYPE_NAME,
blsd.BZ as TASK_TYPE_NUM,
btl.DESCRIBE as BAO_BAO_NUM_NAME
from
<include refid="tableName"></include> f
left join bus_listmanager bl on bl.LISTMANAGER_ID = f.LISTMANAGER_ID
left join sys_dictionaries blsd on blsd.DICTIONARIES_ID = bl.TASK_TYPE
left join bus_term_library btl on btl.TASK_NUM = f.BAO_BAO_NUM and btl.WORK_TYPE = blsd.BZ
where f.ISDELETE = '0'
<if test="LISTMANAGER_ID != null and LISTMANAGER_ID != ''"><!-- 关键词检索 -->
and f.LISTMANAGER_ID = #{LISTMANAGER_ID}
</if>
</select>
<!-- &lt;!&ndash; 查询未对接数据 &ndash;&gt;-->
<!-- <select id="findHidden" parameterType="pd" resultType="pd" >-->
<!-- SELECT-->
<!-- h.HIDDEN_ID-->
<!-- FROM BUS_HIDDEN h-->
<!-- WHERE-->
<!-- h.RISKITEM_ID = #{LISTCHECKITEM_ID}-->
<!-- AND h.LISTMANAGER_ID = #{LISTMANAGER_ID}-->
<!-- AND h.ISDELETE = '0' and h.SOURCE = '2'-->
<!-- AND h.STATE NOT IN ('4','0') limit 1-->
<!-- </select>-->
<!-- <select id="listByriskpointid" parameterType="pd" resultType="pd">-->
<!-- select-->
<!-- <include refid="Field"></include>-->
<!-- from-->
<!-- <include refid="tableName"></include> f-->
<!-- left join bus_listmanager bl on bl.LISTMANAGER_ID = f.LISTMANAGER_ID-->
<!-- where f.ISDELETE = '0' and bl.ISDELETE != '-1'-->
<!-- <if test="RISKPOINT_ID != null and RISKPOINT_ID != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;-->
<!-- and f.RISKPOINT_ID = #{RISKPOINT_ID}-->
<!-- </if>-->
<!-- <if test="RISKPOINT_IDS != null">&lt;!&ndash; 关键词检索 &ndash;&gt;-->
<!-- and f.RISKPOINT_ID in-->
<!-- <foreach item="item" index="index"-->
<!-- collection="RISKPOINT_IDS" open="(" separator="," close=")">-->
<!-- '${item}'-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </select>-->
<!-- &lt;!&ndash; 批量删除 &ndash;&gt;-->
<!-- <delete id="deleteList" parameterType="pd">-->
<!-- update-->
<!-- <include refid="tableName"></include>-->
<!-- set-->
<!-- ISDELETE = '1',-->
<!-- OPERATOR = #{OPERATOR},-->
<!-- OPERATTIME = #{OPERATTIME}-->
<!-- where-->
<!-- LISTMANAGER_ID = #{LISTMANAGER_ID}-->
<!-- </delete>-->
<!-- &lt;!&ndash; 批量删除 &ndash;&gt;-->
<!-- <delete id="deleteAll" parameterType="String">-->
<!-- update-->
<!-- <include refid="tableName"></include>-->
<!-- set-->
<!-- ISDELETE = '1'-->
<!-- where-->
<!-- LISTCHECKITEM_ID in-->
<!-- <foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </delete>-->
<!-- &lt;!&ndash; 查询未对接数据 &ndash;&gt;-->
<!-- <select id="listForDocking" parameterType="pd" resultType="pd" >-->
<!-- SELECT-->
<!-- lc.*,-->
<!-- ci.CHECK_CONTENT-->
<!-- FROM-->
<!-- BUS_LIST_CHECKITEM lc-->
<!-- left join BUS_LISTMANAGER l on l.LISTMANAGER_ID = lc.LISTMANAGER_ID-->
<!-- left join BUS_RISK_CHECK_ITEM ci on l.RISKCHECKITEM_ID = ci.RISKCHECKITEM_ID-->
<!-- WHERE-->
<!-- lc.CORPINFO_ID = #{CORPINFO_ID}-->
<!-- and lc.IS_DOCKING is null-->
<!-- and lc.ISDELETE = 0-->
<!-- and l.ISDELETE = 0-->
<!-- </select>-->
<!-- <select id="findByRiskPointIds" resultType="com.zcloud.entity.PageData">-->
<!-- select distinct a.LISTMANAGER_ID-->
<!-- from bus_list_checkitem a-->
<!-- where a.RISKPOINT_ID in-->
<!-- <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </select>-->
<!-- <select id="findByRiskPointId" resultType="com.zcloud.entity.PageData">-->
<!-- select distinct a.LISTMANAGER_ID-->
<!-- from bus_list_checkitem a-->
<!-- where a.ISDELETE = '0'-->
<!-- <if test="RISKPOINT_ID != null and RISKPOINT_ID != ''">-->
<!-- and a.RISKPOINT_ID = #{RISKPOINT_ID}-->
<!-- </if>-->
<!-- <if test="riskPoints != null and riskPoints.size > 0">-->
<!-- and a.RISKPOINT_ID in-->
<!-- <foreach item="item" index="index" collection="riskPoints" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </select>-->
<!-- <update id="updateDocking" parameterType="pd" >-->
<!-- update-->
<!-- BUS_LIST_CHECKITEM-->
<!-- set-->
<!-- IS_DOCKING = 1-->
<!-- where-->
<!-- LISTCHECKITEM_ID = #{LISTCHECKITEM_ID}-->
<!-- </update>-->
</mapper>