Skip to content

H
hnxtbaboot
Commit d235f6c2 by wuchengwu
Options

设备管理修改厂商新增，设备注册流程

parent 7866ef43
Showing with 280 additions and 61 deletions
src/main/java/com/founder/cjqx/controller/SysClientCsController.java
......@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
......
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
package com.founder.cjqx.controller;
import com.founder.cjqx.service.SysClientCsService;
import com.founder.cjqx.service.SysClientVpService;
import com.founder.model.*;
import com.founder.utils.DateUtil;
......@@ -18,12 +19,14 @@ import org.springframework.util.StopWatch;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import static com.cc.utls.Base64Util.xzxtencode;
......@@ -35,9 +38,14 @@ import static com.cc.utls.Base64Util.xzxtencode;
@Controller
public class SysClientVpController {
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
@Resource
private SysClientVpService sysClientVpService;
@Resource
private SysClientCsService sysClientCsService;
List<SysClientCs> csList = new ArrayList<>();
/*
获取设备list
*/
......@@ -50,16 +58,17 @@ public class SysClientVpController {
if (sysClientVp.getCjsblxcode() != null && sysClientVp.getCjsblxcode().equals("1")) {
sysClientVp.setSsdwcode(user.getUnitcode());
}
//我的设备管理 默认查询本人采集
if (sysClientVp.getCjsblxcode() != null && sysClientVp.getCjsblxcode().equals("2")) {
try {
String ip = SysUitl.getIp(request);
sysClientVp.setBaseIp(ip);
try {
String ip = SysUitl.getIp(request);
sysClientVp.setBaseIp(xzxtencode(ip));
// sysClientVp.setZrmjjh(user.getPolicemanid());
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
// //我的设备管理 默认查询本人采集
// if (sysClientVp.getCjsblxcode() != null && sysClientVp.getCjsblxcode().equals("2")) {
//
// }
//ip mac 加密 查询条件加密
if (sysClientVp.getIp() != null && !sysClientVp.getIp().equals("")) {
sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
......@@ -307,6 +316,7 @@ public class SysClientVpController {
@GetMapping("/newSheb")
public String newSheb(HttpServletRequest request, HttpServletResponse response, Model model) {
try {
csList = sysClientCsService.selectClientCsByCjsblx();
// StopWatch stopWatch = new StopWatch();
// stopWatch.start("获取本地ip耗时：");
String ip = SysUitl.getIp(request);
......@@ -328,10 +338,29 @@ public class SysClientVpController {
*/
@GetMapping("/ClientVp/{id}")
public String getClientVp(@PathVariable("id") String id, Model model) {
csList = sysClientCsService.selectClientCsByCjsblx();
model.addAttribute("ClientVp", sysClientVpService.SelectClientVp(id).getData());
return "cjqx/shebupdate";
}
/**
*
* @param cjsbCode
* @param request
* @return
*/
@RequestMapping(value = "/queryClientCsBySblx", method = RequestMethod.GET)
@ResponseBody
public List<SysClientCsLxDto> queryClientCsBySblx( String cjsbCode, HttpServletRequest request) {
List<SysClientCsLxDto> resultList = new ArrayList<>();
for (SysClientCs csLxDto:csList) {
cjsblxCode( csLxDto, cjsbCode,resultList);
}
resultList.stream().sorted(Comparator.comparing(SysClientCsLxDto::getCjsblx));
return resultList;
}
//修改
@PostMapping("/updateClientVp")
@ResponseBody
......@@ -373,4 +402,64 @@ public class SysClientVpController {
model.addAttribute("getMCjsj", getMCjsj);
return "cjqx/files";
}
private void cjsblxCode(SysClientCs cs, String code,List<SysClientCsLxDto> resultList) {
SysClientCsLxDto lxDto = new SysClientCsLxDto();
if (cs.getCjsblx().equals(code) && "1".equals(code)) {
lxDto.setCjsblx(cs.getZwcjycode());
lxDto.setCjsbname(cs.getZwcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code)&& "2".equals(code)) {
lxDto.setCjsblx(cs.getEdzydqcode());
lxDto.setCjsbname(cs.getEdzydqname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code)&& "3".equals(code)) {
lxDto.setCjsblx(cs.getSgtzzccjycode());
lxDto.setCjsbname(cs.getSgtzzccjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "4".equals(code)) {
lxDto.setCjsblx(cs.getSjcjycode());
lxDto.setCjsbname(cs.getSjcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "5".equals(code)) {
lxDto.setCjsblx(cs.getZjcjycode());
lxDto.setCjsbname(cs.getZjcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "6".equals(code)) {
lxDto.setCjsblx(cs.getHmcjycode());
lxDto.setCjsbname(cs.getHmcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "7".equals(code)) {
lxDto.setCjsblx(cs.getSwcjycode());
lxDto.setCjsbname(cs.getSwcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "8".equals(code)) {
lxDto.setCjsblx(cs.getBjcjycode());
lxDto.setCjsbname(cs.getBjcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "9".equals(code)) {
lxDto.setCjsblx(cs.getGpycode());
lxDto.setCjsbname(cs.getGpyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "10".equals(code)) {
lxDto.setCjsblx(cs.getYhkcjycode());
lxDto.setCjsbname(cs.getYhkcjyname());
resultList.add(lxDto);
}
if (cs.getCjsblx().equals(code) && "11".equals(code)) {
lxDto.setCjsblx(cs.getDnabqdyjcode());
lxDto.setCjsbname(cs.getDnabqdyjname());
resultList.add(lxDto);
}
}
}
src/main/java/com/founder/cjqx/dao/SysClientCsMapper.java
......@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
@Mapper
......@@ -14,6 +15,10 @@ public interface SysClientCsMapper {
int selectPageCount(SysClientCs sysClientCs);
int saveSysClientCs(SysClientCs sysClientCs);
SysClientCs selectSysClientCs(String id);
SysClientCs selectClientCsCode(Map<String ,String> map);
int updateSysClientCs(SysClientCs sysClientCs);
int deleteSysClientCs(String id);
List<SysClientCs> selectClientCsByCjsblx();
}
\ No newline at end of file
src/main/java/com/founder/cjqx/service/SysClientCsService.java
......@@ -2,6 +2,8 @@ package com.founder.cjqx.service;
import com.founder.model.*;
import java.util.List;
/**
* Created by libin on 2018/4/12.
*/
......@@ -13,4 +15,6 @@ public interface SysClientCsService {
XzxtRestResult updateClientCs(SysClientCs SysClientCs);
XzxtRestResult deleteClientCs(String id);
List<SysClientCs> selectClientCsByCjsblx();
}
src/main/java/com/founder/cjqx/service/impl/SysClientCsServiceImpl.java
......@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.founder.utils.SequenceUtil.getNextId;
......@@ -24,74 +26,141 @@ public class SysClientCsServiceImpl implements SysClientCsService {
@Override
public ResultMap ClientCsAll(SysClientCs SysClientCs) {
List<SysClientCs> SysClientCslist=SysClientCsMapper.selectPageList(SysClientCs);
ResultMap resultMap=new ResultMap();
List<SysClientCs> SysClientCslist = SysClientCsMapper.selectPageList(SysClientCs);
ResultMap resultMap = new ResultMap();
if (!StringUtils.isEmpty(SysClientCslist)) {
//解密
int totals=SysClientCsMapper.selectPageCount(SysClientCs);
int totals = SysClientCsMapper.selectPageCount(SysClientCs);
resultMap.setCount(totals);
resultMap.setData(SysClientCslist);
return resultMap;
}
return resultMap ;
return resultMap;
}
@Override
public SysClientCs getClientCs(SysClientCs SysClientCs) {
SysClientCs SysClientCsrst = new SysClientCs();
List<SysClientCs> SysClientCslist=SysClientCsMapper.selectClientCs(SysClientCs);
if (SysClientCslist!=null&&SysClientCslist.size()>0) {
SysClientCs SysClientCsrst = new SysClientCs();
List<SysClientCs> SysClientCslist = SysClientCsMapper.selectClientCs(SysClientCs);
if (SysClientCslist != null && SysClientCslist.size() > 0) {
SysClientCsrst = SysClientCslist.get(0);
}
return SysClientCsrst ;
return SysClientCsrst;
}
@Override
public XzxtRestResult SaveClientCs(SysClientCs SysClientCs) {
SysClientCs.setId(getNextId());
SysClientCs.setScbz("0");
int num = SysClientCsMapper.saveSysClientCs(SysClientCs);
XzxtRestResult result = new XzxtRestResult();
if (num == 1) {
result.setStatus(201);
result.setMsg("存入成功");
result.setData(SysClientCs.getId());
// return XzxtRestResult.build(201, "存入成功");
return result;
} else {
return XzxtRestResult.build(202, "存入失败");
}
Map<String, String> map = new HashMap<>(8);
SysClientCs.setId(getNextId());
SysClientCs.setScbz("0");
cjsblx(map, SysClientCs);
SysClientCs clientCs = SysClientCsMapper.selectClientCsCode(map);
//根据已有设备编号+1
int csCode = Integer.parseInt(clientCs.getSbwhr2()) + 1;
cjsblxCode(SysClientCs,csCode+"");
int num = SysClientCsMapper.saveSysClientCs(SysClientCs);
XzxtRestResult result = new XzxtRestResult();
if (num == 1) {
result.setStatus(201);
result.setMsg("存入成功");
result.setData(SysClientCs.getId());
// return XzxtRestResult.build(201, "存入成功");
return result;
} else {
return XzxtRestResult.build(202, "存入失败");
}
}
private void cjsblxCode(SysClientCs cs, String code) {
if ("1".equals(cs.getCjsblx())) {
cs.setZwcjycode(code);
} else if ("2".equals(cs.getCjsblx())) {
cs.setEdzydqcode(code);
} else if ("3".equals(cs.getCjsblx())) {
cs.setSgtzzccjycode(code);
} else if ("4".equals(cs.getCjsblx())) {
cs.setSjcjycode(code);
} else if ("5".equals(cs.getCjsblx())) {
cs.setZjcjycode(code);
} else if ("6".equals(cs.getCjsblx())) {
cs.setHmcjycode(code);
} else if ("7".equals(cs.getCjsblx())) {
cs.setSwcjycode(code);
} else if ("8".equals(cs.getCjsblx())) {
cs.setBjcjycode(code);
} else if ("9".equals(cs.getCjsblx())) {
cs.setGpycode(code);
} else if ("10".equals(cs.getCjsblx())) {
cs.setYhkcjycode(code);
} else if ("11".equals(cs.getCjsblx())) {
cs.setDnabqdyjcode(code);
}
}
private void cjsblx(Map<String, String> map, SysClientCs cs) {
if ("1".equals(cs.getCjsblx())) {
map.put("cjsbname", "ZWCJYCODE");
} else if ("2".equals(cs.getCjsblx())) {
map.put("cjsbname", "EDZYDQCODE");
} else if ("3".equals(cs.getCjsblx())) {
map.put("cjsbname", "SGTZZCCJYCODE");
} else if ("4".equals(cs.getCjsblx())) {
map.put("cjsbname", "SJCJYCODE");
} else if ("5".equals(cs.getCjsblx())) {
map.put("cjsbname", "ZJCJYCODE");
} else if ("6".equals(cs.getCjsblx())) {
map.put("cjsbname", "HMCJYCODE");
} else if ("7".equals(cs.getCjsblx())) {
map.put("cjsbname", "SWCJYCODE");
} else if ("8".equals(cs.getCjsblx())) {
map.put("cjsbname", "BJCJYCODE");
} else if ("9".equals(cs.getCjsblx())) {
map.put("cjsbname", "GPYCODE");
} else if ("10".equals(cs.getCjsblx())) {
map.put("cjsbname", "YHKCJYCODE");
} else if ("11".equals(cs.getCjsblx())) {
map.put("cjsbname", "DNABQDYJCODE");
}
map.put("cjsbCode", cs.getCjsblx());
// return map;
}
@Override
public XzxtRestResult SelectClientCs(String id) {
SysClientCs SysClientCs=SysClientCsMapper.selectSysClientCs(id);
if(!StringUtils.isEmpty(SysClientCs)){
return XzxtRestResult.build(201,"读取成功",SysClientCs);
}else{
return XzxtRestResult.build(202,"读取失败","");
SysClientCs SysClientCs = SysClientCsMapper.selectSysClientCs(id);
if (!StringUtils.isEmpty(SysClientCs)) {
return XzxtRestResult.build(201, "读取成功", SysClientCs);
} else {
return XzxtRestResult.build(202, "读取失败", "");
}
}
@Override
public XzxtRestResult updateClientCs(SysClientCs SysClientCs) {
int num = SysClientCsMapper.updateSysClientCs(SysClientCs);
if (num == 1) {
return XzxtRestResult.build(201, "更新成功");
} else {
return XzxtRestResult.build(202, "更新失败");
}
int num = SysClientCsMapper.updateSysClientCs(SysClientCs);
if (num == 1) {
return XzxtRestResult.build(201, "更新成功");
} else {
return XzxtRestResult.build(202, "更新失败");
}
}
@Override
public XzxtRestResult deleteClientCs(String id)
{
int num=SysClientCsMapper.deleteSysClientCs(id);
if(num==1){
return XzxtRestResult.build(201,"删除成功");
}else{
return XzxtRestResult.build(202,"删除失败");
public XzxtRestResult deleteClientCs(String id) {
int num = SysClientCsMapper.deleteSysClientCs(id);
if (num == 1) {
return XzxtRestResult.build(201, "删除成功");
} else {
return XzxtRestResult.build(202, "删除失败");
}
}
@Override
public List<SysClientCs> selectClientCsByCjsblx() {
List<SysClientCs> sysClientCs = SysClientCsMapper.selectClientCsByCjsblx();
return sysClientCs;
}
}
src/main/java/com/founder/model/SysClientCsLxDto.java 0 → 100644
package com.founder.model;
public class SysClientCsLxDto extends PageBean{
private String cjsblx;
private String cjsbname;
public String getCjsblx() {
return cjsblx;
}
public void setCjsblx(String cjsblx) {
this.cjsblx = cjsblx;
}
public String getCjsbname() {
return cjsbname;
}
public void setCjsbname(String cjsbname) {
this.cjsbname = cjsbname;
}
}
\ No newline at end of file
src/main/resources/mapper/SysClientCsMapper.xml
......@@ -9,8 +9,8 @@
<result column="ZWCJYCODE" jdbcType="VARCHAR" property="zwcjycode" />
<result column="EDZYDQNAME" jdbcType="VARCHAR" property="edzydqname" />
<result column="EDZYDQCODE" jdbcType="VARCHAR" property="edzydqcode" />
<result column="SGTZZCCJYNAME" jdbcType="VARCHAR" property="sftzzcjyname" />
<result column="SGTZZCCJYCODE" jdbcType="VARCHAR" property="sftzzcjycode" />
<result column="SGTZZCCJYNAME" jdbcType="VARCHAR" property="sgtzzccjyname" />
<result column="SGTZZCCJYCODE" jdbcType="VARCHAR" property="sgtzzccjycode" />
<result column="SJCJYNAME" jdbcType="VARCHAR" property="sjcjyname" />
<result column="SJCJYCODE" jdbcType="VARCHAR" property="sjcjycode" />
<result column="ZJCJYNAME" jdbcType="VARCHAR" property="zjcjyname" />
......@@ -50,6 +50,18 @@
AND SCBZ='0'
</where>
</sql>
<!-- 判断设备类型下设备已添加数量-->
<select id="selectClientCsCode" parameterType="map" resultType="com.founder.model.SysClientCs">
select nvl(max(${cjsbname}),0) as sbwhr2 FROM Sys_Client_Cs
where CJSBLX =#{cjsbCode} and scbz = '0'
</select>
<!-- 根据设备类型查询对应设备名与code-->
<select id="selectClientCsByCjsblx" parameterType="map" resultMap="BaseResultMap">
select distinct * from SYS_CLIENT_CS where scbz = '0' order by CJSBLX
</select>
<!-- 通过条件分页查询，返回数据集 -->
<select id="selectPageList" parameterType="com.founder.model.SysClientCs" resultMap="BaseResultMap">
SELECT * FROM
......@@ -77,6 +89,7 @@
select count(1) from Sys_Client_Cs
<include refid="queryWhere"/>
</select>
<!-- 保存设备-->
<insert id="saveSysClientCs" parameterType="com.founder.model.SysClientCs">
insert into Sys_Client_Cs ( ID,CJSBLX,CJSBNAME,ZWCJYCODE,ZWCJYNAME,EDZYDQCODE,EDZYDQNAME,SGTZZCCJYCODE,
......
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -204,7 +204,7 @@
<if test="ssdwcode!=null and ssdwcode !=''">AND vp.SSDW_CODE like #{ssdwcode}||'%'</if>
<if test="maxlrsjStr != null and maxlrsjStr != ''"> and vp.lrsj <![CDATA[<]]> to_date(#{maxlrsjStr , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minlrsjStr != null and minlrsjStr != ''"> and vp.lrsj <![CDATA[>=]]> to_date(#{minlrsjStr , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="baseIp!=null and baseIp !=''">or vp.ip = #{baseIp}</if>
</where>
</sql>
......@@ -215,9 +215,14 @@
(
SELECT A.*, ROWNUM RN
FROM (SELECT * FROM Sys_Client_Vp vp
<include refid="queryWhere"/>) A
<include refid="queryWhere"/>
<if test="baseIp != null and baseIp != ''">
union
SELECT * FROM Sys_Client_Vp vp WHERE vp.SCBZ = '0' AND vp.ip = #{baseIp}
</if>
) A
WHERE ROWNUM <![CDATA[ <= ]]> ${end}
order by A.SPZT,A.GXSJ desc
order by decode(a.ip ,#{baseIp}, A.SPZT), A.SPZT,A.GXSJ desc
)
WHERE RN <![CDATA[ >= ]]> ${begin}
</select>
......@@ -359,17 +364,22 @@
<!-- 通过条件分页查询，返回总记录数 -->
<select id="selectPageCount" parameterType="com.founder.model.SysClientVp" resultType="java.lang.Integer">
select count(1) from Sys_Client_Vp vp
<if test="ycs !=null and ycs != ''">
where vp.scbz ='0'
<if test="ip!=null and ip !=''">AND vp.ip = #{ip}</if>
<if test="spzt!=null and spzt !=''">AND vp.spzt = #{spzt}</if>
<if test="ssdwcode!=null and ssdwcode !=''">AND vp.SSDW_CODE like #{ssdwcode}||'%'</if>
<if test="ssdwcode==null or ssdwcode ==''">AND vp.SSDW_CODE like '43%'</if>
select count (1) from (select * from Sys_Client_Vp vp
<if test="ycs !=null and ycs != ''">where vp.scbz ='0'
<if test=
"ip!=null and ip !=''">AND vp.ip = #{ip}</if>
<if test="spzt!=null and spzt !=''">AND vp.spzt = #{spzt}</if>
<if test="ssdwcode!=null and ssdwcode !=''">AND vp.SSDW_CODE like #{ssdwcode}||'%'</if>
<if test="ssdwcode==null or ssdwcode ==''">AND vp.SSDW_CODE like '43%'</if>
</if>
<if test="ycs ==null or ycs == ''">
<include refid="queryWhere"/>
<if test="baseIp != null and baseIp != ''">
union
SELECT * FROM Sys_Client_Vp vp WHERE vp.SCBZ = '0' AND vp.ip = #{baseIp}
</if>
</if>
)
</select>
<!-- 保存设备-->
<insert id="saveSysClientVp" parameterType="com.founder.model.SysClientVp">
......
src/main/resources/templates/cjqx/sbxxform.html
......@@ -70,7 +70,7 @@
<div class="layui-form-item">
<label class="layui-form-label">隶属单位：</label>
<div class="layui-input-block">
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_QGUNIT',method:'get',textField : 'text', valueField : 'id'"/>
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment