Skip to content

H
hnxtbaboot
Commit b5a496b2 by yangliang
Options

Merge branch 'ythcj_hunan' of http://47.92.108.28/yangliang/hnxtbaboot into ythcj_hunan

parents c35c0e15 c8e7d9fe
Showing with 847 additions and 105 deletions
pom.xml
......@@ -139,6 +139,11 @@
<version>4.2.2</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.11.0</version>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>1.1.5</version>
......
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,16 +316,17 @@ public class SysClientVpController {
@GetMapping("/newSheb")
public String newSheb(HttpServletRequest request, HttpServletResponse response, Model model) {
try {
StopWatch stopWatch = new StopWatch();
stopWatch.start("获取本地ip耗时：");
csList = sysClientCsService.selectClientCsByCjsblx();
// StopWatch stopWatch = new StopWatch();
// stopWatch.start("获取本地ip耗时：");
String ip = SysUitl.getIp(request);
stopWatch.stop();
stopWatch.start("获取本地mac地址耗时：");
String mac = SysUitl.getkhdMac(ip);
stopWatch.stop();
System.out.println("本地ip与mac耗时百分比："+stopWatch.prettyPrint());
// stopWatch.stop();
// stopWatch.start("获取本地mac地址耗时：");
// String mac = SysUitl.getkhdMac(ip);
// stopWatch.stop();
// System.out.println("本地ip与mac耗时百分比："+stopWatch.prettyPrint());
model.addAttribute("sip", ip);
model.addAttribute("mac",mac );
model.addAttribute("mac","" );
} catch (Exception e) {
e.printStackTrace();
}
......@@ -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/controller/TbXwRycjController.java
......@@ -526,8 +526,9 @@ public class TbXwRycjController {
}
}
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
DateFormat df3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (xyrC.getLrsj() != null && !"".equals(xyrC.getLrsj())) {
xyrC.setLrsjStr(df.format(xyrC.getLrsj()));
xyrC.setLrsjStr(df3.format(xyrC.getLrsj()));
}
if (xyrC.getCsrqQsrq() != null && !"".equals(xyrC.getCsrqQsrq())) {
xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
......@@ -536,7 +537,7 @@ public class TbXwRycjController {
xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
}
if (xyrC.getZwcjsj() != null && !"".equals(xyrC.getZwcjsj())) {
xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
xyrC.setZwcjsjStr(df3.format(xyrC.getZwcjsj()));
}
String rybhstr = xyrC.getRybh();
......@@ -673,6 +674,7 @@ public class TbXwRycjController {
public String doAddYsseryxx(AutoTbStRy zbfzxyr, String cjsb, String hmzt, String zjzt, String swzt, String sjzt, String yhkzt, String sswpzt, Model model, HttpServletRequest request, @RequestParam("R_EDZZP_File") MultipartFile R_EDZZP_File, @RequestParam("R_ZMZP_File") MultipartFile R_ZMZP_File, MultipartFile R_CMZP_File, MultipartFile R_YCMZP_File) {
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
DateFormat df1 = new SimpleDateFormat("MM/dd/yyyy");
DateFormat df3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
if (zbfzxyr.getCsrqQsrqStr() == null || zbfzxyr.getCsrqQsrqStr().equals("")) {
zbfzxyr.setCsrqQsrq(null);
......@@ -946,7 +948,7 @@ public class TbXwRycjController {
}
}
if (xyrC.getLrsj() != null && !"".equals(xyrC.getLrsj())) {
xyrC.setLrsjStr(df.format(xyrC.getLrsj()));
xyrC.setLrsjStr(df3.format(xyrC.getLrsj()));
}
if (xyrC.getCsrqQsrq() != null && !"".equals(xyrC.getCsrqQsrq())) {
xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
......@@ -955,7 +957,7 @@ public class TbXwRycjController {
xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
}
if (xyrC.getZwcjsj() != null && !"".equals(xyrC.getZwcjsj())) {
xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
xyrC.setZwcjsjStr(df3.format(xyrC.getZwcjsj()));
}
String rybhstr = xyrC.getRybh();
String savePath = "/personphoto/" + rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4) + "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
......@@ -1052,6 +1054,7 @@ public class TbXwRycjController {
}
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
DateFormat df1 = new SimpleDateFormat("MM/dd/yyyy");
DateFormat df3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
if (zbfzxyr.getCsrqQsrqStr() == null || zbfzxyr.getCsrqQsrqStr().equals("")) {
zbfzxyr.setCsrqQsrq(null);
......@@ -1348,7 +1351,7 @@ public class TbXwRycjController {
}
}
if (xyrC.getLrsj() != null && !"".equals(xyrC.getLrsj())) {
xyrC.setLrsjStr(df.format(xyrC.getLrsj()));
xyrC.setLrsjStr(df3.format(xyrC.getLrsj()));
}
if (xyrC.getCsrqQsrq() != null && !"".equals(xyrC.getCsrqQsrq())) {
xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
......@@ -1357,7 +1360,7 @@ public class TbXwRycjController {
xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
}
if (xyrC.getZwcjsj() != null && !"".equals(xyrC.getZwcjsj())) {
xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
xyrC.setZwcjsjStr(df3.format(xyrC.getZwcjsj()));
}
String rybhstr = xyrC.getRybh();
String savePath = "/personphoto/" + rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4) + "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
......@@ -2211,16 +2214,22 @@ public class TbXwRycjController {
content[i][0] = ryxx.getRybh();
content[i][1] = ryxx.getXm();
content[i][2] = ryxx.getXbdm();
content[i][3] = ryxx.getGmsfhm();
if(ryxx.getGmsfhm()==null||"".equals(ryxx.getGmsfhm())){
content[i][3] = ryxx.getZjhm();
}else {
content[i][3] = ryxx.getGmsfhm();
}
content[i][4] = ryxx.getSzzwbh();
content[i][5] = ryxx.getLxdm();
if (ryxx.getZwcjsj() != null) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateString = formatter.format(ryxx.getZwcjsj());
content[i][5] = dateString;
content[i][6] = dateString;
} else {
content[i][5] = "";
content[i][6] = "";
}
content[i][6] = ryxx.getLxdm();
content[i][7] = ryxx.getZwcjdwdm();
if (ryxx.getSzzwbh() == null || "".equals(ryxx.getSzzwbh())) {
......@@ -2336,6 +2345,24 @@ public class TbXwRycjController {
xyrxx.setEjcsjStr(ejcsj);
User user = (User) request.getSession().getAttribute("User");
//xyrxx.setLrr(user.getUnitcode());
// if(StringUtils.isBlank(xyrxx.getRCjdw())){
// xyrxx.setRCjdw(user.getUnitcode());
// }
if (xyrxx.getLrdwdm() == null || "".equals(xyrxx.getLrdwdm())) {
String grade = user.getGrade();
String ucode = user.getUnitcode();
if ("S".equals(grade)) {
xyrxx.setLrdwdm(ucode.substring(0, 2) + "0000000000");
} else if ("D".equals(grade)) {
xyrxx.setLrdwdm(ucode.substring(0, 4) + "00000000");
} else if ("X".equals(grade)) {
xyrxx.setLrdwdm(ucode.substring(0, 6) + "000000");
} else if ("K".equals(grade)) {
xyrxx.setLrdwdm(ucode.substring(0, 8) + "0000");
} else {
xyrxx.setLrdwdm(ucode.substring(0, 10) + "00");
}
}
List<AfisQualityCk> ryxxs = afisQualityService.queryZljcList(xyrxx);
//excel标题
......
src/main/java/com/founder/dao/AfisQualityCcrwDao.java
......@@ -25,6 +25,8 @@ public interface AfisQualityCcrwDao extends MyMapper<AfisQualityCcrw> {
public List<AfisQualityCcrw> getAfisQualityCcrw(Map<String, Object> map);
public List<AfisQualityCcrw> getAfisQualityCcrwlbxq(Map<String, Object> map);
public List<AfisQualityCcrw> getAfisQualityCcrwByRwbh(Map<String, Object> map);
public boolean insertCcrw(Map<String, Object> map);
......
src/main/java/com/founder/dao/AfisQualityCkDao.java
package com.founder.dao;
import com.founder.model.AfisQualityCk;
import com.founder.model.AfisQualityDto;
import com.founder.util.MyMapper;
import org.springframework.stereotype.Component;
......@@ -41,6 +42,8 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> {
public Integer queryZlccPageCount(Map<String, Object> map);
public Integer queryZlccjcPageCount(Map<String, Object> map);
public List<AfisQualityCk> queryZlccPageList(Map<String, Object> map);
public Integer queryZlccFirstPageCount(Map<String, Object> map);
......@@ -51,4 +54,17 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> {
public List<AfisQualityCk> queryZlccWcPageList(Map<String, Object> map);
public List<AfisQualityCk> queryZlccDwList(Map<String, Object> map);
public List<AfisQualityDto> queryZlccjcPageList(Map<String, Object> map);
/***************************抽查任务导出*******************************************/
/**
* 抽查任务下的单位
* @param map
* @return
*/
public List<AfisQualityDto> queryZlccRwDwList(Map<String, Object> map);
public List<AfisQualityDto> queryCcrwtjList(Map<String, Object> map);
/*********************************************************************/
}
src/main/java/com/founder/dao/IDictitemDao.java
......@@ -17,6 +17,9 @@ import java.util.Map;
public interface IDictitemDao {
List<SysDictitem> queryDictList(Map map);
List<SysDictitem> getDictByRybh(Map<String, Object> map);
List<SysDictitem> queryDictByPid(Map<String, Object> map);
int queryDictPageCount(Map map);
boolean deleteDict(String dictId);
boolean insertDict(Map map);
......
src/main/java/com/founder/khtj/dao/KhtjDao.java
......@@ -18,9 +18,11 @@ public interface KhtjDao {
public List<RstBean> getRycjtjListzwcjs(Map<String, String> map);
public List<RstBean> getRycjtjListzwxzcjs(Map<String, String> map);
public List<RstBean> getRycjtjListzwwcjs(Map<String, String> map);
public List<RstBean> getRycjtjListzwzlcjs(Map<String, String> map);//指纹质量采集数
public List<RstBean> getRycjtjListrxcjs(Map<String, String> map);
public List<RstBean> getRycjtjListrxxzcjs(Map<String, String> map);
public List<RstBean> getRycjtjListrxwcjs(Map<String, String> map);
public List<RstBean> getRycjtjListrxzlcjs(Map<String, String> map);//人像质量采集数
public List<RstBean> getRycjtjListsgcjs(Map<String, String> map);
public List<RstBean> getRycjtjListsgxzcjs(Map<String, String> map);
......@@ -46,6 +48,8 @@ public interface KhtjDao {
public List<RstBean> getRycjtjListdnaxzcjs(Map<String, String> map);
public List<RstBean> getRycjtjListdnawcjs(Map<String, String> map);
public List<RstBean> getRycjtjListsjcjsNew(Map<String, String> map);//根据新的手机采集数定义获取数据
public List<RstBean> getRycjtjListsjzlcjs(Map<String, String> map);//手机质量采集数
public List<RstBean> getRycjtjListsjcjs(Map<String, String> map);
public List<RstBean> getRycjtjListsjlxcjs(Map<String, String> map);
public List<RstBean> getRycjtjListsjxzcjs(Map<String, String> map);
......@@ -56,9 +60,12 @@ public interface KhtjDao {
public List<RstBean> getZwzltjListrst(Map<String, String> map);
public List<RstBean> gethgzltjListrst(Map<String, String> map);
public List<UnitCodeBean> getUnitCodeList(Map<String, String> map);
public List<AutoTbStRy> queryPageList(Map<String, Object> map);
public List<AutoTbStRy> querySjxxPageList(Map<String, Object> map);
public List<AutoTbStRy> queryHglPageList(Map<String, Object> map);
}
src/main/java/com/founder/khtj/domain/RstBean.java
......@@ -28,6 +28,9 @@ public class RstBean implements Serializable {
private String zycs;//应采数
private String zycstotal;//应采总数
private String zwycs;//指纹应采数
private String zwzlcjs;//指纹质量采集数
private String zwzlcjl;//指纹质量采集率
private String zwcjs;//指纹采集数
private String zwxzcjs;//指纹新增采集数
private String zwwcjs;//指纹未采集数
......@@ -37,6 +40,9 @@ public class RstBean implements Serializable {
private String zwwcjtotal;//指纹未采集总数
private String zwcjltotal;//指纹采集总率
private String rxycs;//人像应采数
private String rxzlcjs;//人像质量采集数
private String rxzlcjl;//人像质量采集率
private String rxcjs;//人像采集数
private String rxxzcjs;//人像新增采集数
private String rxwcjs;//人像未采集数
......@@ -73,6 +79,8 @@ public class RstBean implements Serializable {
private String zjwcjtotal;//足迹未采集总数
private String zjcjltotal;//足迹采集总率
private String sjzlcjs;//手机质量采集数
private String sjzlcjl;//手机质量采集率
private String sjycs;//手机应采数
private String sjcjs;//手机采集数
private String sjxzcjs;//手机新增采集数
......@@ -99,6 +107,17 @@ public class RstBean implements Serializable {
private String dnawcjtotal;//DNA未采集总数
private String dnacjltotal;//DNA采集总率
private String sxzlcjl;//三项质量合格率，表示十指纹、人像、手机质量合格率
private String ifslgzd;//是否为森林高支队透视
public String getIfslgzd() {
return ifslgzd;
}
public void setIfslgzd(String ifslgzd) {
this.ifslgzd = ifslgzd;
}
public String getRys() {
return rys;
......@@ -671,4 +690,78 @@ public class RstBean implements Serializable {
public void setSjsxwcjtotal(String sjsxwcjtotal) {
this.sjsxwcjtotal = sjsxwcjtotal;
}
public String getZwzlcjs() {
return zwzlcjs;
}
public void setZwzlcjs(String zwzlcjs) {
this.zwzlcjs = zwzlcjs;
}
public String getZwzlcjl() {
return zwzlcjl;
}
public void setZwzlcjl(String zwzlcjl) {
this.zwzlcjl = zwzlcjl;
}
public String getRxzlcjs() {
return rxzlcjs;
}
public void setRxzlcjs(String rxzlcjs) {
this.rxzlcjs = rxzlcjs;
}
public String getRxzlcjl() {
return rxzlcjl;
}
public void setRxzlcjl(String rxzlcjl) {
this.rxzlcjl = rxzlcjl;
}
public String getSjzlcjs() {
return sjzlcjs;
}
public void setSjzlcjs(String sjzlcjs) {
this.sjzlcjs = sjzlcjs;
}
public String getSjzlcjl() {
return sjzlcjl;
}
public void setSjzlcjl(String sjzlcjl) {
this.sjzlcjl = sjzlcjl;
}
public String getSxzlcjl() {
return sxzlcjl;
}
public void setSxzlcjl(String sxzlcjl) {
this.sxzlcjl = sxzlcjl;
}
public String getZwycs() {
return zwycs;
}
public void setZwycs(String zwycs) {
this.zwycs = zwycs;
}
public String getRxycs() {
return rxycs;
}
public void setRxycs(String rxycs) {
this.rxycs = rxycs;
}
}
src/main/java/com/founder/khtj/service/IRycjtjService.java
......@@ -13,6 +13,10 @@ public interface IRycjtjService {
public List<RstBean> getSjcjs(RstBean ajflpt, String unit_matchstring, int unitgrade, int ifslgzd);
public List<RstBean> getHgl(RstBean ajflpt, String unit_matchstring, int unitgrade, int ifslgzd);
public EasyUIPage queryHglPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot, String ifslgzd);
public EasyUIPage queryRyxxPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot,String ifslgzd);
public EasyUIPage querySjxxPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot);
}
src/main/java/com/founder/login/controller/LoginController.java
......@@ -220,9 +220,9 @@ public class LoginController {
String res="";
// 设置默认时间
RequestConfig defaultRequestConfig = RequestConfig.custom()
.setSocketTimeout(5000000)//表示数据传输处理时间
.setConnectTimeout(5000000)//建立连接的timeout时间
.setConnectionRequestTimeout(5000000)
.setSocketTimeout(5000)//表示数据传输处理时间
.setConnectTimeout(5000)//建立连接的timeout时间
.setConnectionRequestTimeout(5000)
.build();
//创建一个HttpClient
//先建立一个客户端实例，将模拟一个浏览器
......@@ -258,6 +258,7 @@ public class LoginController {
res = HttpClientUtil.doRequest(httpclient, post, cookieStore);
} catch (IOException e) {
e.printStackTrace();
res="admin";
}
//获取Cookies
List<Cookie> cookies = cookieStore.getCookies();
......
src/main/java/com/founder/model/AfisQualityCcrw.java
......@@ -19,17 +19,35 @@ public class AfisQualityCcrw implements Serializable {
private Date ccsjJzsj; //抽查时间截止时间
private String ccsjJzsjStr; //抽查时间截止时间
private String ccdw; //抽查单位
private String ccdwStr; //抽查单位名称
private String ccfs; //抽查份数
private String jcfs; //已检查份数
private String cjdwdm; //创建单位
private String cjr; //创建人
private Date cjsj; //创建时间
private String cjsjStr; //创建时间
private String bz; //备注
private String rwbz; //备注
private String gxdwdm; //修改单位
private String gxr; //修改人
private Date gxsj; //修改时间
public String getCjsjStr() {
return cjsjStr;
}
public void setCjsjStr(String cjsjStr) {
this.cjsjStr = cjsjStr;
}
public String getCcdwStr() {
return ccdwStr;
}
public void setCcdwStr(String ccdwStr) {
this.ccdwStr = ccdwStr;
}
public String getXxbh() {
return xxbh;
}
......
src/main/java/com/founder/model/Sjcjl.java 0 → 100644
package com.founder.model;
import java.util.List;
/**
* @author wcw
* @version 1.0
* @date 2021/8/5 14:32
*/
public class Sjcjl {
private List<TbRyRycj> tbRyRycjList;
private List<TbRyRycj> slList;
private List<TbRyRycj> gzList;
public List<TbRyRycj> getSlList() {
return slList;
}
public void setSlList(List<TbRyRycj> slList) {
this.slList = slList;
}
public List<TbRyRycj> getGzList() {
return gzList;
}
public void setGzList(List<TbRyRycj> gzList) {
this.gzList = gzList;
}
public List<TbRyRycj> getTbRyRycjList() {
return tbRyRycjList;
}
public void setTbRyRycjList(List<TbRyRycj> tbRyRycjList) {
this.tbRyRycjList = tbRyRycjList;
}
}
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/java/com/founder/module/redis/controller/DictController.java
......@@ -98,6 +98,18 @@ public class DictController {
return ZTreeNodeList;
}
@RequestMapping(value = "/queryDictByPid", method = RequestMethod.GET)
@ResponseBody
public List<SysDictitem> queryDictByPid( String code,HttpServletRequest request) {
User user = (User)request.getSession().getAttribute("User");
String pid = user.getUnitcode();
List<SysDictitem> dictitemList = new ArrayList<SysDictitem>();
dictitemList = dicItemService.queryDictByPid(code,pid);
return dictitemList;
}
@RequestMapping(value="/queryAjxzJsonActon",method= RequestMethod.GET,produces="text/html;charset=UTF-8")
@ResponseBody
public String queryAjxzJson(String yycj,String code_val,String flag) {
......
src/main/java/com/founder/module/redis/service/IDicItemService.java
......@@ -21,6 +21,12 @@ public interface IDicItemService {
boolean updateDict(SysDictitem entity);
/**
* 根据字典pid与code查询
* @return
*/
List<SysDictitem> queryDictByPid(String code,String pid);
/**
* 查询字典类别
* @return
*/
......
src/main/java/com/founder/module/redis/service/impl/IDicItemServiceImpl.java
......@@ -201,6 +201,14 @@ public class IDicItemServiceImpl implements IDicItemService {
return dicItemDao.updateDict(map);
}
@Override
public List<SysDictitem> queryDictByPid(String code,String pid) {
Map<String,Object> map = new HashMap<>();
map.put("code",code);
map.put("pid",pid);
List<SysDictitem> sysDictitems = dicItemDao.queryDictByPid(map);
return sysDictitems;
}
public List<ZTreeNode> getZtreeNode(String code_type, String id, String yycj, String unitcode) {
......
src/main/java/com/founder/ryswtz/controller/RyxxController.java
......@@ -70,8 +70,9 @@ public class RyxxController {
xyrC = new AutoTbStRy();
}
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
DateFormat df3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if(xyrC.getLrsj()!=null&&!"".equals(xyrC.getLrsj())){
xyrC.setLrsjStr(df.format(xyrC.getLrsj()));
xyrC.setLrsjStr(df3.format(xyrC.getLrsj()));
}
if(xyrC.getCsrqQsrq()!=null&&!"".equals(xyrC.getCsrqQsrq())) {
xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
......@@ -80,7 +81,7 @@ public class RyxxController {
xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
}
if(xyrC.getZwcjsj()!=null&&!"".equals(xyrC.getZwcjsj())){
xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
xyrC.setZwcjsjStr(df3.format(xyrC.getZwcjsj()));
}
/*String rybh = xyrC.getRybh();
......
src/main/java/com/founder/service/AfisQualityCcrwService.java
......@@ -9,10 +9,12 @@ import java.util.List;
public interface AfisQualityCcrwService extends IService<AfisQualityCcrw> {
public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc);
public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc,String pid);
public AfisQualityCcrw getAfisQualityCcrw(String xxbh);
public AfisQualityCcrw getAfisQualityCcrwlbxq(String xxbh,String rwbh,String sfdrw);
public AfisQualityCcrw getAfisQualityCcrwByRwbh(String rwbh);
public boolean insertCcrw(AfisQualityCcrw entity);
......
src/main/java/com/founder/service/AfisQualityService.java
package com.founder.service;
import com.founder.model.AfisQualityCk;
import com.founder.model.AfisQualityDto;
import com.founder.model.User;
import com.founder.utils.EasyUIPage;
......@@ -19,11 +20,30 @@ public interface AfisQualityService extends IService<AfisQualityCk> {
public EasyUIPage queryZljcPage(EasyUIPage page, AfisQualityCk entity);
public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg);
public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg,int jcfs);
public List<AfisQualityCk> queryZljcList(AfisQualityCk entity);
public List<AfisQualityCk> queryZlccList(AfisQualityCk entity,String rwbh);
public List<AfisQualityDto> queryZlccList(AfisQualityCk entity, String rwbh);
public EasyUIPage queryZlccjcPage(EasyUIPage page, AfisQualityCk entity,String sfdrw, String ccdw,String ssdw);
/**
* 质量抽查详情导出
* @param entity
* @param sfdrw
* @return
*/
public List<AfisQualityDto> getCcdwData( AfisQualityCk entity,String sfdrw,String ccdw);
/**
* 获取抽查任务单位
* @param entity
* @param sfdrw
* @return
*/
public List<AfisQualityDto> queryZlccRwDwList( AfisQualityCk entity,String sfdrw);
/**
* 指纹质量检查保存函数
* @param afisQualityCk
......
src/main/java/com/founder/service/impl/AfisQualityCcrwServiceImpl.java
package com.founder.service.impl;
import com.founder.dao.AfisQualityCcrwDao;
import com.founder.dao.IDictitemDao;
import com.founder.model.AfisQualityCcrw;
import com.founder.model.SysDictitem;
import com.founder.service.AfisQualityCcrwService;
import com.founder.utils.EasyUIPage;
import org.slf4j.Logger;
......@@ -10,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
......@@ -25,8 +28,11 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
@Autowired
private AfisQualityCcrwDao mapper;
@Resource
private IDictitemDao dictitemDao;
@Override
public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc) {
public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc,String pid) {
Map<String, Object> map = new HashMap<>();
map.put("begin", page.getBegin());
map.put("end", page.getEnd());
......@@ -39,6 +45,10 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
map.put("sort", sort);
map.put("order", order);
map.put("entity", entity);
//添加字典查询条件
map.put("code","CODE_SXDWCC");
map.put("pid",pid);
List<SysDictitem> dictitemList = dictitemDao.queryDictByPid(map);
if(entity!=null&&entity.getRwbh()!=null&&!"".equals(entity.getRwbh())){
page.setTotal(mapper.queryZlccrwByRwbhPageCount(map));
}else {
......@@ -63,6 +73,11 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
}
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
for (int i=0;i<afisQualityCks.size();i++) {
if(afisQualityCks.get(i).getCjsj()!=null&&!"".equals(afisQualityCks.get(i).getCjsj())){
afisQualityCks.get(i).setCjsjStr(df.format(afisQualityCks.get(i).getCjsj()));
}else{
afisQualityCks.get(i).setCjsjStr("");
}
if(afisQualityCks.get(i).getCcsjQssj()!=null&&!"".equals(afisQualityCks.get(i).getCcsjQssj())){
afisQualityCks.get(i).setCcsjQssjStr(df.format(afisQualityCks.get(i).getCcsjQssj()));
}else{
......@@ -73,6 +88,20 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
}else{
afisQualityCks.get(i).setCcsjJzsjStr("");
}
if(afisQualityCks.get(i).getCcdw() != null){
String ccdwStr ="";
String[] words = afisQualityCks.get(i).getCcdw() .split(",");
for (SysDictitem dict:dictitemList ) {
for (int s=0;s<words.length;s++){
if(dict.getCode().substring(0,6).equals(words[s])){
ccdwStr += ","+dict.getName();
}
}
}
if(ccdwStr != null && ccdwStr !="") {
afisQualityCks.get(i).setCcdw(ccdwStr.substring(1));
}
}
}
page.setRows(afisQualityCks);
......@@ -104,6 +133,31 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
}
@Override
public AfisQualityCcrw getAfisQualityCcrwlbxq(String xxbh, String rwbh,String sfdrw) {
AfisQualityCcrw xyrC = new AfisQualityCcrw();
Map map = new HashMap();
map.put("xxbh", xxbh);
map.put("rwbh", rwbh);
map.put("sfdrw", sfdrw);
List<AfisQualityCcrw> xyrCs = mapper.getAfisQualityCcrwlbxq(map);
if ((xyrCs != null) && (xyrCs.size() > 0)) {
xyrC = xyrCs.get(0);
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
if(xyrC.getCcsjQssj()!=null&&!"".equals(xyrC.getCcsjQssj())){
xyrC.setCcsjQssjStr(df.format(xyrC.getCcsjQssj()));
}else{
xyrC.setCcsjQssjStr("");
}
if(xyrC.getCcsjJzsj()!=null&&!"".equals(xyrC.getCcsjJzsj())){
xyrC.setCcsjJzsjStr(df.format(xyrC.getCcsjJzsj()));
}else{
xyrC.setCcsjJzsjStr("");
}
}
return xyrC;
}
@Override
public AfisQualityCcrw getAfisQualityCcrwByRwbh(String rwbh)
{
AfisQualityCcrw xyrC = new AfisQualityCcrw();
......
src/main/java/com/founder/utils/ExportExcels.java
......@@ -37,6 +37,7 @@ public class ExportExcels {
// 第四步，创建单元格，并设置值表头 设置表头居中
HSSFCellStyle style = wb.createCellStyle();
style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);//垂直居中
//声明列对象
HSSFCell cell = null;
......
src/main/java/com/founder/utils/OkHttpUtils.java 0 → 100644
package com.founder.utils;
import com.alibaba.fastjson.JSON;
import com.founder.model.Sjcjl;
import lombok.extern.log4j.Log4j;
import okhttp3.*;
import okhttp3.Response;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.concurrent.TimeUnit;
/**
* http请求工具类
* <p>
*
* @author：wcw date：2020/12/15
* version：1.0
*/
@Log4j
public class OkHttpUtils {
public static String miGuPost(String url, String json, String sign, String ts, String token, String ip, int port
) throws IOException {
//增加代理
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(20000,TimeUnit.SECONDS);
builder.writeTimeout(20000,TimeUnit.SECONDS);
builder.readTimeout( 20000,TimeUnit.SECONDS);
//代理服务器的IP和端口号
// builder.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(ip, port)));
OkHttpClient okHttpClient = builder.build();
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"),json);
Request request = new Request.Builder()
.header("Content-Type","application/json")
.url(url)
.post(body).addHeader("sign",sign).addHeader("ts",ts).addHeader("token",token)
.build();
Response response = okHttpClient.newCall(request).execute();
String result =response.body().string();
return result;
}
public static String post(String url, String json) throws IOException {
//增加代理
OkHttpClient.Builder builder = new OkHttpClient.Builder();
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"),json);
Request request = new Request.Builder()
.url(url)
.post(body)
.build();
Response response ;
// builder.connectTimeout(CONNECTTIMEOUT,TimeUnit.SECONDS);
// builder.writeTimeout(WRITETIMEOUT,TimeUnit.SECONDS);
// builder.readTimeout( READTIMEOUT,TimeUnit.SECONDS);
response = builder.build().newCall(request).execute();
String result =response.body().string();
return result;
}
public static String get(String url) throws IOException {
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(20000,TimeUnit.SECONDS);
builder.writeTimeout(20000,TimeUnit.SECONDS);
builder.readTimeout( 20000,TimeUnit.SECONDS);
Request request = new Request.Builder()
.url(url)
.build();
Response response ;
response = builder.build().newCall(request).execute();
String result =response.body().string();
return result;
}
public static void main(String[] args) {
try {
String sjUrl = "http://localhost:8030/hglqktj?ccdw=43__00000000&maxccsjStr=2024-01-01&minccsjStr=2014-05-05";
String post = get(sjUrl);
System.out.println(post);
Sjcjl sjcjl = JSON.parseObject(post,Sjcjl.class);
System.out.println(sjcjl.toString());
} catch (IOException e) {
e.printStackTrace();
}
}
}
src/main/resources/mapper/AfisQualityCcrwSqlMapper.xml
......@@ -17,14 +17,17 @@
<sql id="queryWhere">
<if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if>
<if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR } </if>
<if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR } </if>
<if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR }</if>
<if test="entity.cjdwdm != null and entity.cjdwdm != ''"> AND CJDWDM = #{entity.cjdwdm , jdbcType=VARCHAR } </if>
<if test="entity.ccsjQssjStr != null and entity.ccsjQssjStr != ''"> AND cjsj <![CDATA[>=]]> to_date(#{entity.ccsjQssjStr , jdbcType=VARCHAR },'yyyy-mm-dd') </if>
<if test="entity.ccsjJzsjStr != null and entity.ccsjJzsjStr != ''"> AND cjsj <![CDATA[<]]> to_date(#{entity.ccsjJzsjStr , jdbcType=VARCHAR },'yyyy-mm-dd')+1 </if>
</sql>
<select id="queryZlccrwPageCount" resultType="int" parameterType="map">
select count(*) from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1'
AND A.SCBZ = '0'
<if test="entity.bz != null and entity.bz != ''">
AND RWBZ = '1'
</if>
<include refid="queryWhere"/>
</select>
......@@ -44,7 +47,10 @@
A.BZ as bz,
A.CJSJ as cjsj
from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1'
AND A.SCBZ = '0'
<if test="entity.bz != null and entity.bz != ''">
AND RWBZ = '1'
</if>
<include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t
......@@ -114,6 +120,7 @@
A.XXBH as xxbh,
A.RWBH as rwbh,
A.CCDW as ccdw,
(select name from sys_dictitem s where s.groupid='CODE_SXDWCC' and SUBSTR(s.code,0, 6) = A.CCDW) as ccdwStr ,
A.CCSJ_QSSJ as ccsjQssj,
A.CCSJ_JZSJ as ccsjJzsj,
A.CCFS as ccfs,
......@@ -128,6 +135,49 @@
and A.XXBH = #{xxbh , jdbcType=VARCHAR }
</select>
<!-- 质量抽查多任务列表 -->
<select id="getAfisQualityCcrwlbxq" resultType="com.founder.model.AfisQualityCcrw" parameterType="map">
SELECT
A.XXBH AS xxbh,
A.RWBH AS rwbh,
A.CCDW AS ccdw,
( SELECT name FROM sys_dictitem s WHERE s.groupid = 'CODE_SXDWCC' AND SUBSTR( s.code, 0, 6 ) = A.CCDW ) AS ccdwStr,
A.CCSJ_QSSJ AS ccsjQssj,
A.CCSJ_JZSJ AS ccsjJzsj,
<if test=" sfdrw == 'true'">
cs.CCFS AS ccfs,
cs.JCFS AS jcfs,
</if>
<if test="sfdrw == 'false'">
A.CCFS AS ccfs,
A.JCFS AS jcfs,
</if>
A.CJDWDM AS cjdwdm,
A.CJR AS cjr,
A.BZ AS bz,
A.RWBZ AS rwbz,
A.CJSJ AS cjsj
FROM
<if test=" sfdrw == 'true'">
(
SELECT
sum( A.jcfs ) AS jcfs,
SUM( A.ccfs ) AS ccfs,
rwbh
FROM
AFIS_QUALITY_CCRW A
WHERE
A.rwbh = #{rwbh , jdbcType=VARCHAR }
AND A.SCBZ = '0'
GROUP BY
rwbh
) cs,
</if>
AFIS_QUALITY_CCRW A
WHERE A.SCBZ = '0'
and A.XXBH = #{xxbh , jdbcType=VARCHAR }
</select>
<select id="getAfisQualityCcrwByRwbh" resultType="com.founder.model.AfisQualityCcrw" parameterType="map">
select
A.XXBH as xxbh,
......@@ -208,7 +258,7 @@
where SCBZ = '0'
<if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if>
<if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR } </if>
<if test="entity.rwbh == null or entity.rwbh == ''"> AND RWBH ='' </if>
<!-- <if test="entity.rwbh == null or entity.rwbh == ''"> AND RWBH ='' </if>-->
</update>
</mapper>
\ No newline at end of file
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
......@@ -304,6 +304,7 @@
R_SJLXDH,
ZWFKXX,
TBBZ,
LXDM,
LRDWDM,
LRR,
LRSJ,
......
src/main/resources/mapper/DictitemSqlMap.xml
......@@ -44,10 +44,13 @@
<sql id="queryWhere">
<if test="entity.code != null and entity.code != ''">AND CODE = #{entity.code , jdbcType=VARCHAR }</if>
<if test="entity.groupid != null and entity.groupid != ''">AND GROUPID = #{entity.groupid , jdbcType=VARCHAR }</if>
<if test="entity.groupid != null and entity.groupid != ''">AND GROUPID = #{entity.groupid , jdbcType=VARCHAR }
</if>
<if test="entity.name != null and entity.name != ''">AND NAME like #{entity.name , jdbcType=VARCHAR }||'%'</if>
<if test="entity.lrdwdm != null and entity.lrdwdm != ''">AND LRDWDM = #{entity.lrdwdm , jdbcType=VARCHAR }</if>
<if test="entity.groupname != null and entity.groupname != ''">AND GROUPNAME like #{entity.groupname , jdbcType=VARCHAR } ||'%'</if>
<if test="entity.groupname != null and entity.groupname != ''">AND GROUPNAME like
#{entity.groupname , jdbcType=VARCHAR } ||'%'
</if>
<if test="entity.lrsj != null">AND LRSJ = #{entity.lrsj , jdbcType=TIMESTAMP }</if>
</sql>
......@@ -81,6 +84,22 @@
from SYS_DICTITEM where (SCBZ='0' or SCBZ is null) and ID = #{dictId , jdbcType=VARCHAR }
</select>
<select id="queryDictByPid" resultMap="BaseResultMap" parameterType="map">
SELECT
code,
name,
groupid,
pid
FROM
SYS_DICTITEM
WHERE
groupid = #{code , jdbcType=VARCHAR }
AND scbz = '0'
<if test="pid != null and pid != ''">
and pid like SUBSTR(#{pid , jdbcType=VARCHAR },0,4) || '%'
</if>
</select>
<select id="queryDictGroupId" resultType="com.founder.model.ZTreeNode">
select GROUPID as ids,GROUPID as id, GROUPID as codeType,null as pid, GROUPNAME as name, GROUPNAME as text, count(1)
from SYS_DICTITEM
......@@ -308,7 +327,9 @@
<if test="entity.yycj5 != null and entity.yycj5 != ''">YYCJ5 = #{entity.yycj5 , jdbcType=VARCHAR },</if>
<if test="entity.yycj6 != null and entity.yycj6 != ''">YYCJ6 = #{entity.yycj6 , jdbcType=VARCHAR },</if>
<if test="entity.description != null and entity.description != ''">DESCRIPTION = #{entity.description , jdbcType=VARCHAR },</if>
<if test="entity.description != null and entity.description != ''">DESCRIPTION =
#{entity.description , jdbcType=VARCHAR },
</if>
<if test="entity.description == null or entity.description == ''">DESCRIPTION = null,</if>
<if test="entity.endcode != null and entity.endcode != ''">ENDCODE = #{entity.endcode , jdbcType=VARCHAR },</if>
<if test="entity.startcode != null and entity.startcode != ''">STARTCODE
......
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
......@@ -162,6 +162,9 @@
<script src="/static/layui/layui.js" charset="utf-8"></script>
<script src="/static/layui/layui.all.js" charset="utf-8"></script>
<script>
$(function () {
openCombotree('ssdwcode');
});
layui.use('table', function(){
var date = new Date();
var table = layui.table;
......
src/main/resources/templates/home.html
......@@ -183,6 +183,9 @@
<li id="H10D02">
<a onclick="toSjcjtj()">手机采集信息统计</a>
</li>
<li id="H10D03">
<a onclick="toHgltj()">合格率信息统计</a>
</li>
</ul>
</div>
</div>
......@@ -418,6 +421,10 @@
window.open("/toSjtj?isfirst=1",'_blank');
}
function toHgltj(){
window.open("/toHgltj?isfirst=1",'_blank');
}
function ajxxgl(){
window.open("/toAjJbxxDetail?asjxgrybh=1&zjhm=111",'_blank');
}
......@@ -587,7 +594,7 @@
</script>
<!-- 权限机制-->
<div style="display: none" id="perurl" th:text="${session.perurl}"></div>
<script id="scripturlid" src="static/common/js/checkurl.js" type="text/javascript"></script>
<!--<div style="display: none" id="perurl" th:text="${session.perurl}"></div>-->
<!--<script id="scripturlid" src="static/common/js/checkurl.js" type="text/javascript"></script>-->
</body>
</html>
\ No newline at end of file
src/main/resources/templates/khtj/cxlist.html
......@@ -47,6 +47,7 @@
<input type="hidden" name="unitgrade" id="unitgrade" th:value="${unitgrade}">
<input type="hidden" name="cot" id="cot" th:value="${cot}">
<input type="hidden" name="ifslgzd" id="ifslgzd" th:value="${ifslgzd}">
<input type="hidden" name="name" id="name" th:value="${name}">
</form>
</div>
<!--查询结果 table-->
......@@ -325,8 +326,9 @@
var unitgrade = $("#unitgrade").val();
var cot = $("#cot").val();
var name = $("#name").val();
var ifslgzd = $("#ifslgzd").val();
window.location.href="/exportExcelToRytjxq?unitCode="+unitCode+"&endCcsj="+endCcsj+"&startCcsj="+startCcsj
+"&slType="+slType+"&unitgrade="+unitgrade+"&cot="+cot+"&name="+name;
+"&slType="+slType+"&unitgrade="+unitgrade+"&cot="+cot+"&name="+name+"&ifslgzd="+ifslgzd;
}
function doExportExcel(){
var rybh = $("#rybh").val();
......
src/main/resources/templates/khtj/sjlist.html
......@@ -47,6 +47,7 @@
<input type="hidden" name="slType" id="slType" th:value="${slType}">
<input type="hidden" name="unitgrade" id="unitgrade" th:value="${unitgrade}">
<input type="hidden" name="cot" id="cot" th:value="${cot}">
<input type="hidden" name="ifslgzd" id="ifslgzd" th:value="${ifslgzd}">
<input type="hidden" name="name" id="name" th:value="${name}">
<input type="hidden" name="sjcjEsUrl" id="sjcjEsUrl" th:value="${sjcjEsUrl}">
</form>
......@@ -281,8 +282,9 @@
var unitgrade = $("#unitgrade").val();
var cot = $("#cot").val();
var name = $("#name").val();
var ifslgzd = $("#ifslgzd").val();
window.location.href=sjcjEsUrl+"/exportExcelToRysjtjxq?unitCode="+unitCode+"&endCcsj="+endCcsj+"&startCcsj="+startCcsj
+"&slType="+slType+"&unitgrade="+unitgrade+"&cot="+cot+"&name="+name;
+"&slType="+slType+"&unitgrade="+unitgrade+"&cot="+cot+"&name="+name+"&ifslgzd="+ifslgzd;
}
function doExportExcel(){
var rybh = $("#rybh").val();
......
src/main/resources/templates/rygl/ryxxlist.html
......@@ -776,8 +776,10 @@
}
var sjjbxx = row.sjjbxx;
var sjlxrxx = row.sjlxrxx;
var sjthjl = row.sjthjl;
var sjdxjl = row.sjdxjl;
var sjzt;
if (sjjbxx == null || sjjbxx == "" || sjjbxx <= 0 || sjlxrxx == null || sjlxrxx == "" || sjlxrxx <= 0) {
if ((sjjbxx == null || sjjbxx == "" || sjjbxx <= 0) && ( sjlxrxx == null || sjlxrxx == "" || sjlxrxx <= 0 ) && (sjthjl == null || sjthjl == "" || sjthjl <= 0 ) &&( sjdxjl == null || sjdxjl == "" || sjdxjl <= 0)) {
sjzt = "0";
} else {
sjzt = "1";
......@@ -1081,7 +1083,8 @@
pageNumber : 1,
loadFilter: function(data){
var ifxz = $("#ifxz").val();
if(ifxz=="1"&&data!=null&&data.total>0){
var zjhm1 = $("#zjhm").val();
if(ifxz=="1"&&data!=null&&data.total>0&& zjhm1 != "无"){
$.messager.alert( '提示',"该人员在近3天内录入过人员信息，请在列表中选择该人员信息进行修改操作！");
}else if(ifxz=="1"){
addpage();
......@@ -1327,7 +1330,9 @@
// }
$("#flrsjStr").datebox("setValue", $("#cxqssj").val());
$("#ifxz").val("1");
doQuery();
doQuery();
$('#newsave').dialog('close');
}
}
......
src/main/resources/templates/ryswtz/ryswtzxx.html
......@@ -75,7 +75,7 @@
<p>正面采集照片</p>
</div>
</div>
<div> <input type="file" id="rxbdzp" name="rxbdzp" style="width: 186px;" ><a href="javascript:void(0)" class="btn_cx" onclick="openDialog('#photo-dialog')">人像比对</a></div>
<div style="display: none;"> <input type="file" id="rxbdzp" name="rxbdzp" style="width: 186px;" ><a href="javascript:void(0)" class="btn_cx" onclick="openDialog('#photo-dialog')">人像比对</a></div>
</td>
</tr>
<tr>
......@@ -128,7 +128,7 @@
<td class="td_r">采集人</td>
<td id="zwcjrXm" class="td_bg" th:text="${ryxx.zwcjrXm}"></td>
<td class="td_r" style="width:10%;">采集时间</td>
<td id="zwcjsj" class="td_bg" th:value="${ryxx.zwcjsjStr}" style="width:20%;"></td>
<td id="zwcjsj" class="td_bg" th:text="${ryxx.zwcjsjStr}" style="width:20%;"></td>
</tr>
</table>
</div>
......
src/main/resources/templates/zlcc/cxlist.html
......@@ -24,6 +24,8 @@
</head>
<body style="overflow: auto">
<input type="hidden" id="unitcode" name="unitcode" th:value="${unitcode}"/>
<header class="heade-box">
<img src="static/xtba/zlcc/img/title_ccrwgl.png" class="header-title-img" alt="">
</header>
......@@ -78,7 +80,20 @@
//pageList : [5,10,15,20], //rows
//pageNumber : 1 //显示在第几页
});
// 调用子页面方法
var frame = document.getElementById("f1");
function chuandicanshu(){
var unitcode = $('#unitcode').val();
frame.onload = function(){
frame.contentWindow.unitcode(unitcode);
}
// .contentWindow.unitcode(unitcode);
}
$(function () {
chuandicanshu()
});
//新建弹框
function newDialog(){
var dialogId='new';
......
src/main/resources/templates/zljc/zljccx.html
......@@ -478,7 +478,7 @@ function codeFormatter(val,type){
}
function openNew(rybh,szzwbh,cjsj){
//window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
// window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
$.ajax({
url: "doCprExistAmiss",
......
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