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

根据用户卡号查信息

pull/4/head
dearlin 2024-01-29 10:18:20 +08:00
parent c353987bd2
commit 771d0f04e7
4 changed files with 289 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zcloud/controller/mapApi/MapController.java
View File

@ -1,6 +1,8 @@
package com.zcloud.controller.mapApi;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.system.UsersService;
import com.zcloud.util.Jurisdiction;
@ -9,6 +11,7 @@ import com.zcloud.util.ReturnMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* 说明：TODO
@ -30,6 +33,7 @@ public class MapController extends BaseController {
* @Return: java.lang.String
*/
@RequestMapping(value = "/getPersonnelTypeCount")
@ResponseBody
public ReturnMap getPersonnelTypeCount() throws Exception {
PageData pageData = getPageData();
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
@ -45,6 +49,7 @@ public class MapController extends BaseController {
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/getAlarmTypeCount")
@ResponseBody
public ReturnMap getAlarmTypeCount() throws Exception {
return ReturnMap.ok().put("data", PLSUtil.getAlarmTypeCount(Jurisdiction.getCORPINFO_ID()));
}
@ -57,8 +62,9 @@ public class MapController extends BaseController {
* @Return: com.zcloud.util.ReturnMap
*/
@RequestMapping(value = "/getPersonnelPositioningCount")
public ReturnMap getPersonnelPositioningCount() throws Exception {
// return ReturnMap.ok().put("data", PLSUtil.getPersonnelPositioningCount(Jurisdiction.getCORPINFO_ID()));
return ReturnMap.error();
@ResponseBody
public ReturnMap getPersonnelPositioningCount(Page page) throws Exception {
JSONObject personnelPositioningCount = PLSUtil.getPersonnelPositioningCount(Jurisdiction.getCORPINFO_ID(), page.getCurrentPage(), page.getShowCount());
return ReturnMap.ok().put("data", personnelPositioningCount);
}
}

266
src/main/java/com/zcloud/controller/mapApi/MapEightController.java Normal file
View File

@ -0,0 +1,266 @@
package com.zcloud.controller.mapApi;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.util.ReturnMap;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：实时地图八项工作内容
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/map/Eight")
public class MapEightController extends BaseController {
// @Autowired
// private MapEightService mapEightService;
//
// @Autowired
// private RestTemplate restTemplate;
//
// /**
// * @return
// * @throws Exception
// */
// @RequestMapping(value = "/getEcharts")
// @ResponseBody
// public Object getEcharts() throws Exception {
// PageData pd = new PageData();
// pd = this.getPageData();
// return mapEightService.getEchartsOrder(pd);
// }
//
// /**
// * 可视化首页统计数据
// *
// * @param
// * @throws Exception
// */
// @RequestMapping(value = "/findFormCount")
// @ResponseBody
// public Object findFormCount() throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = this.getPageData();
//
// PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd);
// map.put("pd", data);
// map.put("result", errInfo);
// return map;
// }
//
// /**
// * 作业实时情况展示（最新18条）
// *
// * @param
// * @throws Exception
// */
// @RequestMapping(value = "/listHighRiskWork")
// @ResponseBody
// public Object listHighRiskWork(Page page) throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// List<PageData> varList = new ArrayList<>();
// //根据条件增加参数或减少参数 都没有 直接返回空
// if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) {
// List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
// if (ArrayDATA_IDS.size() == 0) {
// map.put("result", errInfo);
// return map;
// }
// pd.put("ids", ArrayDATA_IDS);
// pd.remove("CORPINFO_ID");
// }
// page.setPd(pd);
// varList = mapEightService.listHighRiskWorkOrder(page);
// map.put("varList", varList);
// map.put("result", errInfo);
// return map;
// }
//
// /**
// * 获取所有高危作业的位置坐标（有坐标数据）
// *
// * @param
// * @throws Exception
// */
// @RequestMapping(value = "/listAllHighRiskWorkLocation")
// @ResponseBody
// public Object listAllHighRiskWorkLocation(@RequestParam(value = "CORPINFO_ID") String CORPINFO_ID, @RequestParam("TYPE") String type, @RequestParam("GANGKOU") String GANGKOU, @RequestParam("AREA") String AREA) throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
// List<PageData> varList = new ArrayList<>();
// //根据条件增加参数或减少参数 都没有 直接返回空
// varList = mapEightService.listAllHighRiskWorkLocationOrder(pd);
// map.put("varList", varList);
// map.put("result", errInfo);
// return map;
// }
//
// /**
// * 根据id以及类型获取数据 一公司
// *
// * @param id 数据id
// * @param type 数据类型 动火 等等
// * @return
// */
// @RequestMapping(value = "/getById")
// @ResponseBody
// public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
// PageData pd = this.getPageData();
// return mapEightService.getById(pd);
// }
//
// /**
// * 根据id以及类型获取数据 其他公司
// *
// * @param id 数据id
// * @param type 数据类型 动火 等等
// * @return
// */
// @RequestMapping(value = "/getByIdOrder")
// @ResponseBody
// public Object getByIdOrder(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
// PageData pd = new PageData();
// pd = this.getPageData();
// return mapEightService.getByIdOrder(pd);
//
// }
//
// /**
// * 列表
// *
// * @param page
// * @throws Exception
// */
// @RequestMapping(value = "/list")
// @ResponseBody
// public Object list(Page page) throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// List<PageData> varList = mapEightService.listAll(pd); //列出HotWorkApplicationDelayed列表
// map.put("varList", varList);
// map.put("page", page);
// map.put("result", errInfo);
// return map;
// }
//
// /**
// * 获取动火防护措施
// *
// * @param
// * @throws Exception
// */
// @RequestMapping(value = "/listAllMeasures")
// @ResponseBody
// public Object listAllMeasures() throws Exception {
// Map<String, Object> map = new HashMap<String, Object>();
// String errInfo = "success";
// PageData pd = this.getPageData();
//
// List<PageData> varList = mapEightService.listAllMeasures(pd); //根据ID读取
// map.put("varList", varList);
// map.put("result", errInfo);
// return map;
// }
//
//
// /**
// * 根据id以及类型获取数据 //曹妃甸东
// *
// * @param id 数据id
// * @param type 数据类型 动火 等等
// * @return
// */
// @RequestMapping(value = "/getByIdCfdD")
// @ResponseBody
// public Object getByIdCfdD(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
// PageData pd = this.getPageData();
// MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
// paramMap.add("id", pd.getString("id"));
// paramMap.add("TYPE", pd.getString("TYPE"));
// paramMap.add("HOTWORK_ID", pd.getString("HOTWORK_ID"));
// Map<String, Object> result =
// restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getByIdOrder", paramMap, Map.class);
// return result;
// }
//
// /*曹妃甸专用接口-开始*/
//
// /**
// * @Description: 获取八项作业所有作业人员
// * @Date: 2023/9/23/023 9:04
// * @Param:
// * @Return:
// */
// @RequestMapping("/getAllWorkUserCards")
// @ResponseBody
// public ReturnMap getAllWorkUserCards() {
// PageData pageData = this.getPageData();
// MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
// Map<String, Object> result =
// restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllWorkUserCards", paramMap, Map.class);
// return ReturnMap.ok(result);
// }
//
// /**
// * @Description: 获取八项作业所有作业人员
// * @Date: 2023/9/23/023 9:04
// * @Param:
// * @Return:
// */
// @RequestMapping("/getAllTickets")
// @ResponseBody
// public ReturnMap getAllTickets() {
// PageData pageData = this.getPageData();
// MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
// Map<String, Object> result =
// restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllTickets", paramMap, Map.class);
// return ReturnMap.ok(result);
// }
//
// /**
// * @Description: 获取八项作业所有作业人员
// * @Date: 2023/9/23/023 9:04
// * @Param:
// * @Return:
// */
// @RequestMapping("/findEightsByUserId")
// @ResponseBody
// public ReturnMap findEightsByUserId() {
// PageData pageData = this.getPageData();
// MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
// paramMap.add("empNo", pageData.getString("empNo"));
// paramMap.add("TYPE", pageData.getString("TYPE"));
// Map<String, Object> result =
// restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findEightsByUserId", paramMap, Map.class);
// return ReturnMap.ok(result);
// }
/*曹妃甸专用接口-结束*/
}

2
src/main/java/com/zcloud/util/PLSUtil.java
View File

@ -31,7 +31,7 @@ public class PLSUtil {
public static HashMap<String, String> BAKEADDR = new HashMap<>();
private static RestTemplate restTemplate;
public static Object getPersonnelPositioningCount(String CORPINFO_ID, Integer currentPage, Integer showCount) throws Exception {
public static JSONObject getPersonnelPositioningCount(String CORPINFO_ID, Integer currentPage, Integer showCount) throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", getToken(CORPINFO_ID));
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);

19
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1395,12 +1395,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
</select>
<select id="getUserByCardNo" resultType="com.zcloud.entity.PageData">
select
*
from
<include refid="tableName"></include>
where
CARDNO = #{CARDNO} and ISDELETE = 0 and CORPINFO_ID = #{CORPINFO_ID}
select u.*,
r.ROLE_ID,
r.ROLE_NAME,
d.NAME as DEPARTMENT_NAME,
p.NAME AS POST_NAME
from <include refid="tableName"></include> u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
left join SYS_POST p on p.POST_ID=u.POST_ID
u.CARDNO = #{CARDNO} and u.ISDELETE = 0
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
and u.CORPINFO_ID = #{CORPINFO_ID}
</if>
</select>
</mapper>