guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
liulixin 2024-01-09 16:13:25 +08:00
parent fdaa0401fd 98706069a5
commit 8ee622cdf2
24 changed files with 211 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java
View File

@ -318,18 +318,19 @@ public class AppHiddenExamineController extends BaseController {
@RequestMapping(value = "/special")
@ResponseBody
@Transactional
@DockAnnotation
public Object special() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData examine = new PageData();
examine.put("TYPE","1");
examine.put("STATE","-1");
examine.put("EXAMINE",pd.getString("disposalPlan")); //临时措施
examine.put("HIDDEN_ID",pd.getString("HIDDEN_ID"));
examine = hiddenexamineService.saveApp(examine);
pd.put("examine",JSON.toJSONString(examine));
hiddenService.updateStateByHidden("7",pd.getString("HIDDEN_ID"));
PageData mes = new PageData();
PageData hiddenPd = hiddenService.findById(examine);
@ -339,6 +340,7 @@ public class AppHiddenExamineController extends BaseController {
map.put("result", errInfo);
map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！");
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -429,6 +431,7 @@ public class AppHiddenExamineController extends BaseController {
}
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
}

2
src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java
View File

@ -328,7 +328,7 @@ public class AppIdentificationPartsController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java
View File

@ -501,7 +501,7 @@ public class IdentificationPartsController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/bus/LimitSpaceController.java
View File

@ -211,7 +211,7 @@ public class LimitSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel2")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java
View File

@ -306,7 +306,7 @@ public class RestrictedSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

4
src/main/java/com/zcloud/controller/bus/RiskPointController.java
View File

@ -592,7 +592,7 @@ public class RiskPointController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional
@ -804,7 +804,7 @@ public class RiskPointController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel2")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

4
src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java
View File

@ -501,7 +501,7 @@ public class RiskPointTemporaryController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional
@ -717,7 +717,7 @@ public class RiskPointTemporaryController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel2")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/bus/RiskUnitController.java
View File

@ -402,7 +402,7 @@ public class RiskUnitController extends BaseController {
* @throws Exception
*/
@RequestMapping(value = "/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
View File

@ -231,7 +231,7 @@ public class FireDeviceController extends BaseController {
return map;
}
// @RequestMapping(value="/readExcel")
// @RequiresPermissions("fromExcel")
// // @RequiresPermissions("fromExcel")
// @SuppressWarnings("unchecked")
// @ResponseBody
// public Object readExcel(@RequestParam(value="excel",required=false) MultipartFile file) throws Exception {

2
src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java
View File

@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.gatemachine.GateMachineService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ReturnMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -52,6 +53,7 @@ public class GateMachineController extends BaseController {
@RequestMapping(value = "/add")
public ReturnMap add() {
PageData pageData = this.getPageData();
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
gateMachineService.save(pageData);
return ReturnMap.ok();
}

1
src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java
View File

@ -45,6 +45,7 @@ public class GateVideoController extends BaseController {
pd.put("GATEVIDEO_ID", this.get32UUID()); //主键
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人
pd.put("ISDELETE", "0"); //是否删除
gateVideoService.save(pd);
map.put("result", errInfo);

2
src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java
View File

@ -194,7 +194,7 @@ public class GFLimitSpaceController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel2")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

2
src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
View File

@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.hk.HKUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -70,6 +71,7 @@ public class PlatformvideomanagementController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
platformvideomanagementService.save(pd);
map.put("result", errInfo);
return map;

59
src/main/java/com/zcloud/controller/map/MapController.java
View File

@ -10,6 +10,7 @@ import com.zcloud.service.fireresources.FireResourcesService;
import com.zcloud.service.gatemachine.GateMachineService;
//import com.zcloud.service.keyProjects.MeteorologicalService;
//import com.zcloud.service.keyProjects.MeteorologicalinfoService;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.service.keyProjects.VideoManagerService;
import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.UsersService;
@ -46,6 +47,8 @@ public class MapController extends BaseController {
@Autowired
private CorpInfoService corpInfoService;
@Autowired
private PlatformvideomanagementService platformvideomanagementService;
@Autowired
private UsersService usersService;
@ -348,6 +351,27 @@ public class MapController extends BaseController {
public Object getCzksBasicLocationInfoData() {
return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
}
@RequestMapping("/czks/getGatePosition")
@ResponseBody
public ReturnMap getCzksGatePosition() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
//
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> value = gateMachineService.getGatePosition(pageData);
// 添加标点上的统一的title
for (PageData data : value) {
if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) {
data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME"));
} else {
data.put("MAP_POINT_NAME", data.getString("NAME"));
}
}
returnMap.put("varList", value);
return returnMap;
}
/**
* @Description: 人员定位信息
* @Author: dearLin
@ -414,6 +438,41 @@ public class MapController extends BaseController {
// 标签卡
return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
}
/**
* @Description: 获取摄像头定位
* @Author: dearLin
* @Date: 2024/1/6/006 11:15
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping(value = "/czks/getCameraPositioning")
@ResponseBody
public Object getCameraPositioning() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = new PageData();
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
List<PageData> dataList = platformvideomanagementService.listAllForMap(pageData);
returnMap.put("varList",dataList);
return returnMap;
}
/**
* @Description: 设备在线情况
* @Author: dearLin
* @Date: 2024/1/6/006 11:15
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping(value = "/czks/getListMapSluiceCount")
@ResponseBody
public Object getListMapSluiceCount() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = new PageData();
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
List<PageData> dataList = platformvideomanagementService.getListMapSluiceCount(pageData);
returnMap.put("varList",dataList);
return returnMap;
}
@RequestMapping(value = "/czks/person/staff/listPage")
@ResponseBody
public Object getCzksPersonStaffListPage() {

2
src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java
View File

@ -306,7 +306,7 @@ public class QuestionController extends BaseController {
* @throws Exception
*/
@RequestMapping(value="/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional

6
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -1238,7 +1238,7 @@ public class UsersController extends BaseController {
* @throws Exception
*/
@RequestMapping(value = "/readExcel")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
public Object readExcel(@RequestParam(value = "excel", required = false) MultipartFile file) throws Exception {
@ -1452,7 +1452,7 @@ public class UsersController extends BaseController {
* @throws Exception
*/
@RequestMapping(value = "/readExcel2")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
@Transactional
@ -1946,7 +1946,7 @@ public class UsersController extends BaseController {
* @throws Exception
*/
@RequestMapping(value = "/readExcel3")
@RequiresPermissions("fromExcel")
// @RequiresPermissions("fromExcel")
@SuppressWarnings("unchecked")
@ResponseBody
public Object readExcel3(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {

2
src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java
View File

@ -59,5 +59,7 @@ public interface PlatformvideomanagementMapper {
void delLocation(PageData pd);
List<PageData> getListMapSluiceCount(PageData pageData);
}

7
src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
View File

@ -82,17 +82,16 @@ public class GateMachineServiceImpl implements GateMachineService {
@Override
public List<PageData> getGatePosition(PageData pageData) {
// todo 需求变更，现在闸机变成了区域
if (pageData.getString("TYPE").equals("PERSON")) {
if ("PERSON".equals(pageData.getString("TYPE"))) {
pageData.put("GATE_AREA_TYPE", 0);
// 人闸机定位
}
if (pageData.getString("TYPE").equals("CAR")) {
if ("CAR".equals(pageData.getString("TYPE"))) {
// 车闸机定位
pageData.put("GATE_AREA_TYPE", 1);
}
if (pageData.getString("TYPE").equals("CAMERA")) {
if ("camera".equals(pageData.getString("TYPE"))) {
// 摄像头定位
return gateVideoMapper.getCameraPosition(pageData);
}

4
src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java
View File

@ -54,8 +54,10 @@ public interface PlatformvideomanagementService {
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
Object listAllForMap(PageData pd);
List<PageData> listAllForMap(PageData pd);
void delLocation(PageData pd);
List<PageData> getListMapSluiceCount(PageData pageData);
}

43
src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java
View File

@ -26,7 +26,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
@Autowired
private PlatformvideomanagementMapper platformvideomanagementMapper;
/**新增
/**
* 新增
*
* @param pd
* @throws Exception
*/
@ -34,7 +36,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
platformvideomanagementMapper.save(pd);
}
/**删除
/**
* 删除
*
* @param pd
* @throws Exception
*/
@ -42,7 +46,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
platformvideomanagementMapper.delete(pd);
}
/**修改
/**
* 修改
*
* @param pd
* @throws Exception
*/
@ -50,7 +56,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
platformvideomanagementMapper.edit(pd);
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -58,7 +66,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
return platformvideomanagementMapper.datalistPage(page);
}
/**列表(全部)
/**
* 列表(全部)
*
* @param pd
* @throws Exception
*/
@ -66,7 +76,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
return platformvideomanagementMapper.listAll(pd);
}
/**通过id获取数据
/**
* 通过id获取数据
*
* @param pd
* @throws Exception
*/
@ -74,7 +86,9 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
return platformvideomanagementMapper.findById(pd);
}
/**批量删除
/**
* 批量删除
*
* @param ArrayDATA_IDS
* @throws Exception
*/
@ -83,14 +97,8 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
}
@Override
public Object listAllForMap(PageData pd) {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> varList = platformvideomanagementMapper.listAllForMap(pd);
map.put("varList", varList);
map.put("result", errInfo);
return map;
public List<PageData> listAllForMap(PageData pd) {
return platformvideomanagementMapper.listAllForMap(pd);
}
@Override
@ -98,5 +106,10 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
platformvideomanagementMapper.delLocation(pd);
}
@Override
public List<PageData> getListMapSluiceCount(PageData pageData) {
return platformvideomanagementMapper.getListMapSluiceCount(pageData);
}
}

4
src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml
View File

@ -37,6 +37,7 @@
PLATFORMVIDEOMANAGEMENT_ID,
GATEVIDEO_ID,
LATITUDE,
CORPINFO_ID,
LONGITUDE
</sql>
@ -51,6 +52,7 @@
#{PLATFORMVIDEOMANAGEMENT_ID},
#{GATEVIDEO_ID},
#{LATITUDE},
#{CORPINFO_ID},
#{LONGITUDE}
</sql>
@ -243,7 +245,6 @@
SELECT
GATEVIDEO_ID AS id,
VIDEONAME AS `NAME`,
'CAMERA' AS TYPE,
v.LATITUDE,
v.LONGITUDE
FROM
@ -258,6 +259,7 @@
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
and o.CORPINFO_ID = #{CORPINFO_ID}
</if>
GROUP BY v.GATEVIDEO_ID
</select>
</mapper>

6
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
View File

@ -148,9 +148,9 @@
left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
left join oa_department dept1 on dept1.DEPARTMENT_ID = f.USER_ID
left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
left join `qa-czks-regulatory`.SYS_DEPARTMENT redept1 on redept1.DEPARTMENT_ID = f.USER_ID
LEFT JOIN vi_user_all reuser ON reuser.USER_ID = f.USER_ID AND reuser.USERNAME != 'admin'
LEFT JOIN vi_department_all redept ON redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
LEFT JOIN vi_department_all redept1 ON redept1.DEPARTMENT_ID = f.USER_ID
where f.ISDELETE = '0'
<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
and(f.FOREIGN_KEY in

33
src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
View File

@ -57,6 +57,7 @@
REGIONNAME,
REGIONPATH,
REGIONPATHNAME,
CORPINFO_ID,
PLATFORMVIDEOMANAGEMENT_ID
</sql>
@ -81,6 +82,7 @@
#{REGIONNAME},
#{REGIONPATH},
#{REGIONPATHNAME},
#{CORPINFO_ID},
#{PLATFORMVIDEOMANAGEMENT_ID}
</sql>
@ -181,6 +183,37 @@
and f.CORPINFO_ID = #{CORPINFO_ID}
</if>
</select>
<select id="getListMapSluiceCount" resultType="com.zcloud.entity.PageData">
SELECT
0 AS PER_GATE_COUNT,
( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS CAR_GATE_COUNT,
0 AS VIDEO_COUNT
FROM
mk_gate_area f
WHERE
f.ISDELETE = 0
AND f.GATE_AREA_TYPE = 1
AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
SELECT
( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS PER_GATE_COUNT,
0 AS CAR_GATE_COUNT,
0 AS VIDEO_COUNT
FROM
mk_gate_area f
WHERE
f.ISDELETE = 0
AND f.GATE_AREA_TYPE = 0
AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
SELECT
0 AS PER_GATE_COUNT,
0 AS CAR_GATE_COUNT,
COUNT( 1 ) AS VIDEO_COUNT
FROM
bus_gatevideo f
WHERE
f.ISDELETE = 0
AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">