diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/fragmentW.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/fragmentW.html new file mode 100644 index 00000000..8adcc1e0 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/fragmentW.html @@ -0,0 +1,14 @@ + + + + +
  • +

    +

    +

    +
    • + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html new file mode 100644 index 00000000..d279ea35 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html @@ -0,0 +1,171 @@ + + + + + + + + +
    +
    +
    +
    +
    +
      +
    • +

      执法部门：

      + +
      • +
    • +

      企业名称：

      + +
      • +
    • +

      时段：

      + + + + +
      • +
    • +  搜索 +  重置 + 导出 +
      • +
    +
      +
    • +

      +

      +

      +
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html index e8b663cf..500ee144 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html @@ -41,7 +41,8 @@

  • 时段：

    - + + - - - - - -
    • - - -  搜索 -  重置 - -
    +
    +
    +
    +
    +
      +
    • +

      时段：

      + + + + +
      • +
    +
    +  搜索 +  重置 +
    +
    +
    @@ -205,7 +209,12 @@ var searchType; var rowData=[]; var echart1=echarts.init(document.getElementById('container1')); - /*var chart2=echarts.inint(document.getElementById('container2'))*/ + var echart2=echarts.init(document.getElementById('container2')); + var echart3=echarts.init(document.getElementById('container3')); + var echart4=echarts.init(document.getElementById('container4')); + var currentYear = new Date().getFullYear(); + var currentMonth = new Date().getMonth()+1; + var currentQuarter=quarterMake(currentMonth); //console.log(uniteNumber); //console.log(checkCategory); window.onload = function () { @@ -215,7 +224,10 @@ $("#month2").hide(); rTable(); echarts1(); - }; + echarts2(); + echarts3(); + echarts4(); + } $(function() { var options = { modalName: "执法记录统计", @@ -230,7 +242,7 @@ //quarterBoolean:quarterBoolean, columns: [ { - field : 'lawEnforcement', + field : 'bureauDeptName', title : '执法部门' }, { @@ -335,13 +347,15 @@ color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'], tooltip: {}, legend: { + top:'1%', data: ['投诉类型统计'] }, series: [ { name: '投诉类型统计', type: 'pie', - radius: ['40%', '70%'], + radius: ['15%', '30%'], + center:['50%','50%'], data: response, label: { show: true, @@ -377,14 +391,43 @@ var dateSearch = document.getElementById("dateSearch"); console.log(dateSearch.value); if(dateSearch.value=="quarter"){ + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; $("#quarter").show(); $("#month").hide(); document.getElementById("month").value=""; }else if(dateSearch.value=="month"){ + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; $("#quarter").hide(); document.getElementById("quarter").value=""; $("#month").show(); + }else if(dateSearch.value=="select-time"){ + $("#select-time").show(); + $("#year").hide(); + document.getElementById("year").value=""; + $("#quarter").hide(); + document.getElementById("quarter").value=""; + $("#month").hide(); + document.getElementById("month").value=""; }else { + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; $("#quarter").hide(); document.getElementById("quarter").value=""; $("#month").hide(); @@ -523,6 +566,18 @@ } var encodedUri=encodeURI(csvContent); var link=do*/ + function quarterMake(month){ + let quarter=Math.ceil(month); + if(quarter==1){ + return"第一季度"; + }else if(quarter==2){ + return"第二季度"; + }else if(quarter==3){ + return"第三季度"; + }else if(quarter==4){ + return"第四季度"; + } + } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html new file mode 100644 index 00000000..6a443d3f --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html @@ -0,0 +1,14 @@ + + + + +
  • +

    +

    +

    +
    • + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html new file mode 100644 index 00000000..65226b80 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html @@ -0,0 +1,296 @@ + + + + + + + + + +
    +
    +
    +
    + 企业数量统计 + 企业类型统计 +
    +
    +
    +

    +

    +

    +

    + 导出 +
    +
    +
    +
    +
    +
    +
    +
    +
      +
    • +

      时段：

      + + + + +
      • +
    • +  搜索 +  重置 + 下载 +
      • +
    +
      +
    • +

      +

      +

      +
      • +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java index be1265d9..9b87e3cb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java @@ -53,6 +53,7 @@ public class ComplaintStaticController extends BaseController { LocalDate endTime = localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); complaintStatistics.setBeginTime(str.format(beginTime)); complaintStatistics.setEndTime(str.format(endTime)); + model.addAttribute("yearList",yearMake()); model.addAttribute("year",localDate.getYear()); model.addAttribute("Number1",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size()); model.addAttribute("Number2",complaintStatisticsService.selectComplaintStatisticsGroup(complaintStatistics).size()); @@ -200,4 +201,12 @@ public class ComplaintStaticController extends BaseController { } return complaintStatistics; } + public List yearMake(){ + int current=LocalDate.now().getYear(); + List yearList=new ArrayList<>(); + for(int i=current;i>=2023;i--){ + yearList.add(i); + } + return yearList; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 39d1831c..7fb0a257 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -1,12 +1,10 @@ package com.zdxt.code.controller; +import java.lang.reflect.Array; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -74,6 +72,7 @@ public class EnforcementRegistrationController extends BaseController List uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList()); List checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList()); String checkName=iDictDataService.selectDictLabel("check_category","01"); + model.addAttribute("yearList",yearMake()); model.addAttribute("unite",uniteList.size()); model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size()))); model.addAttribute("check",checkName);//！！ @@ -192,49 +191,88 @@ public class EnforcementRegistrationController extends BaseController @RequiresPermissions("code:registration:list") @PostMapping("/echarts2") @ResponseBody - public List echarts2(EnforcementRegistration enforcementRegistration){ + public List echarts2(){ List statisticsIndicatorList=new ArrayList<>(); - List sList1=new ArrayList<>(); - StatisticsIndicator s1=new StatisticsIndicator(); - StatisticsIndicator s2=new StatisticsIndicator(); - s1.setName("echart1"); - s2.setName("echart2"); - List sList2=new ArrayList<>(); - enforcementRegistration.setYear(LocalDate.now().getYear()+""); - Map dictDataMap=iDictDataService.selectDictDataByType("check_category").stream().collect(Collectors.toMap(DictData::getDictValue,Function.identity())); + LocalDate localDate=LocalDate.now(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + EnforcementRegistration enforcementRegistration =new EnforcementRegistration(); + LocalDate beginTime=localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); - Map checkMap=list.stream().collect(Collectors.groupingBy(item->item.getCheckCategory()==null||"".equals(item.getCheckCategory())?"空":item.getCheckCategory(),Collectors.counting())); - for(String s:checkMap.keySet()){ + Map> map=list.stream().collect(Collectors.groupingBy(EnforcementRegistration::getBureauDeptId)); + for(String s:map.keySet()){ StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); - if(dictDataMap.containsKey(s)){ - statisticsIndicator.setName(dictDataMap.get(s).getDictLabel()); - }else if(s.equals("空")){ - statisticsIndicator.setName(null); - }else { - statisticsIndicator.setName(s); - } - statisticsIndicator.setValue(Integer.parseInt(checkMap.get(s)+"")); - sList1.add(statisticsIndicator); + statisticsIndicator.setName(map.get(s).get(0).getBureauDeptName()); + statisticsIndicator.setValue(map.get(s).size()); + statisticsIndicatorList.add(statisticsIndicator); } - s1.setStatisticsIndicatorList(sList1); - statisticsIndicatorList.add(s1); - Map yearMap=list.stream().collect(Collectors.groupingBy(item->item.getBureauDeptId()==null||"".equals(item.getBureauDeptId())?"空":item.getBureauDeptId(),Collectors.counting())); - Map deptMap=iDeptService.selectDeptAll().stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); - - for(String s:yearMap.keySet()){ + Collections.sort(statisticsIndicatorList); + Collections.reverse(statisticsIndicatorList); + if(statisticsIndicatorList.size()>=10){ + return statisticsIndicatorList.subList(0,9); + } + return statisticsIndicatorList; + } + /** + * 季度柱状图 + */ + @RequiresPermissions("code:registration:list") + @PostMapping("/echarts3") + @ResponseBody + public List echarts3(){ + List statisticsIndicatorList=new ArrayList<>(); + EnforcementRegistration enforcementRegistration=new EnforcementRegistration(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + DateTimeFormatter str3=DateTimeFormatter.ofPattern("MM"); + LocalDate localDate=LocalDate.now(); + localDate=localDate.minusMonths(3); + int quarter=(int)Math.ceil(Double.valueOf(str3.format(localDate))/3); + LocalDate beginTime=localDate.withMonth(quarter*3-2).withDayOfMonth(1); + LocalDate endTime=localDate.withMonth(quarter*3).with(TemporalAdjusters.lastDayOfMonth()); + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); + Map> map=list.stream().collect(Collectors.groupingBy(EnforcementRegistration::getBureauDeptId)); + for(String s:map.keySet()){ StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); - if(deptMap.containsKey(s)){ - statisticsIndicator.setName(deptMap.get(s).getDeptName()); - }else if(s.equals("空")){ - statisticsIndicator.setName(null); - }else { - statisticsIndicator.setName(s); - } - statisticsIndicator.setValue(Integer.parseInt(yearMap.get(s)+"")); - sList2.add(statisticsIndicator); + statisticsIndicator.setName(map.get(s).get(0).getBureauDeptName()); + statisticsIndicator.setValue(map.get(s).size()); + statisticsIndicatorList.add(statisticsIndicator); + } + Collections.sort(statisticsIndicatorList); + Collections.reverse(statisticsIndicatorList); + if(statisticsIndicatorList.size()>=10){ + return statisticsIndicatorList.subList(0,9); + } + return statisticsIndicatorList; + } + @RequiresPermissions("code:registration:list") + @PostMapping("/echarts4") + @ResponseBody + public List echarts4(){ + List statisticsIndicatorList=new ArrayList<>(); + EnforcementRegistration enforcementRegistration=new EnforcementRegistration(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate localDate=LocalDate.now(); + LocalDate beginTime=localDate.withDayOfMonth(1); + LocalDate endTime = localDate.with(TemporalAdjusters.lastDayOfMonth()); + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); + Map> map=list.stream().collect(Collectors.groupingBy(EnforcementRegistration::getBureauDeptId)); + for(String s:map.keySet()){ + StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); + statisticsIndicator.setName(map.get(s).get(0).getBureauDeptName()); + statisticsIndicator.setValue(map.get(s).size()); + statisticsIndicatorList.add(statisticsIndicator); + } + Collections.sort(statisticsIndicatorList); + Collections.reverse(statisticsIndicatorList); + if(statisticsIndicatorList.size()>=10){ + return statisticsIndicatorList.subList(0,9); } - s2.setStatisticsIndicatorList(sList2); - statisticsIndicatorList.add(s2); return statisticsIndicatorList; } @@ -411,7 +449,12 @@ public class EnforcementRegistrationController extends BaseController registration.setParams(params); return ZDResponse.success("查询成功", registration); } - - - + public List yearMake(){ + int current=LocalDate.now().getYear(); + List yearList=new ArrayList<>(); + for(int i=current;i>=2023;i--){ + yearList.add(i); + } + return yearList; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java index b6bc7ab7..6191c254 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java @@ -1,7 +1,9 @@ package com.zdxt.code.controller; +import com.zdxt.code.service.StatisticalPaneService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,11 +14,18 @@ import org.springframework.web.bind.annotation.RequestMapping; @Controller public class StatisticalPanelController extends BaseController { - + @Autowired + private StatisticalPaneService statisticalPaneService; @RequestMapping("/") public ZDResponse home(){ return ZDResponse.success(); } + + @RequestMapping("/") + public ZDResponse complaint(){ + + return ZDResponse.success(""); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java new file mode 100644 index 00000000..8f8ffc42 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java @@ -0,0 +1,278 @@ +package com.zdxt.code.controller; + +import com.zdxt.auth.project.system.dict.service.IDictDataService; +import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.EnterpriseInformation; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.domain.StatisticsIndicator; +import com.zdxt.code.service.IEnterpriseInformationService; +import com.zdxt.common.controller.BaseController; +import com.zdxt.domain.auth.DictData; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/code/statisticsEnterprise") +public class StatisticsEnterpriseController extends BaseController +{ + private String prefix = "project/code/statisticsEnterprise"; + @Autowired + private IEnterpriseInformationService iEnterpriseInformationService; + @Autowired + private IDictDataService iDictDataService; + @RequiresPermissions("code:statisticsEnterprise:view") + @GetMapping() + public String statisticsEnterprise(Model model) { + LocalDate localDate=LocalDate.now(); + List enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation()); + List existList= enterpriseInformationList.stream().filter(item->item.getIsDelete()==0).collect(Collectors.toList()); + List logoutList= enterpriseInformationList.stream().filter(item->item.getIsDelete()==1).collect(Collectors.toList()); + model.addAttribute("yearList",yearMake()); + model.addAttribute("number",enterpriseInformationList.size());//企业总数 + model.addAttribute("exist",existList.size());//续存数量 + model.addAttribute("logout",logoutList.size());//注销数量 + model.addAttribute("year",localDate.getYear()); + model.addAttribute("number2",enterpriseInformationList.size());//企业总数--Tap2 + model.addAttribute("number3","100%"); + return prefix+"/statisticsEnterprise"; + } + @RequiresPermissions("code:statisticsEnterprise:list") + @GetMapping("/listQY") + @ResponseBody + public List statisticsEnterpriseQY() { + ListdictDataList=iDictDataService.selectDictDataByType("address_type");//有序->区 + Map dictDataMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + List list=new ArrayList<>();//无序->深圳市＋区 + for(String s:dictDataMap.keySet()){ + list.add("深圳市"+dictDataMap.get(s)); + } + List enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation()); + List statisticsIndicatorList=new ArrayList<>(); + for(DictData d:dictDataList){ + StatisticsIndicator s=new StatisticsIndicator(); + String name=d.getDictLabel(); + List qyList=new ArrayList<>();//有序区--企业 + if(name.equals("深圳市光明区")){ + qyList=enterpriseInformationList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+name)||item.getEnterpriseAddress().startsWith("深圳市光明新区")).collect(Collectors.toList()); + }else{ + qyList=enterpriseInformationList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+name)).collect(Collectors.toList()); + } + List existList= qyList.stream().filter(item->item.getIsDelete()==0).collect(Collectors.toList()); + List logoutList= qyList.stream().filter(item->item.getIsDelete()==1).collect(Collectors.toList()); + s.setName(name); + s.setTotalNumber(qyList.size()); + s.setNumInt(existList.size()); + s.setValue(logoutList.size()); + statisticsIndicatorList.add(s); + } + List qtList=enterpriseInformationList.stream().filter(item->!qyMake(list,item.getEnterpriseAddress())).collect(Collectors.toList()); + qtList = qtList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市光明新区")).collect(Collectors.toList()); + if(qtList!=null&&qtList.size()>0) { + List existList = qtList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); + List logoutList = qtList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + StatisticsIndicator s = new StatisticsIndicator(); + s.setName("其他"); + s.setTotalNumber(qtList.size()); + s.setNumInt(existList.size()); + s.setValue(logoutList.size()); + statisticsIndicatorList.add(s); + } + return statisticsIndicatorList; + } + + @RequiresPermissions("code:statisticsEnterprise:list") + @GetMapping("/listJD") + @ResponseBody + public List statisticsEnterpriseJD(SearchType searchType) { + ListdictDataList=iDictDataService.selectDictDataByType("address_type"); + Map qyMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue)); + if(qyMap.containsKey(searchType.getName())) { + List jdDictList = iDictDataService.selectDictDataByType(qyMap.get(searchType.getName()));//有序街道 + Map jdMap = jdDictList.stream().collect(Collectors.toMap(DictData::getDictValue, DictData::getDictLabel)); + List enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());//所有企业 + if (searchType.getName().equals("光明区")) {//将该区内的过滤出来 + enterpriseInformationList=enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市"+ searchType.getName())|| item.getEnterpriseAddress().startsWith("深圳市光明新区")).collect(Collectors.toList()); + } else { + enterpriseInformationList=enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市"+ searchType.getName())).collect(Collectors.toList()); + } + List statisticsIndicatorList = new ArrayList<>(); + for (DictData d : jdDictList) {//遍历按序版的区域list + StatisticsIndicator s = new StatisticsIndicator(); + String name = d.getDictLabel(); + List qyList = new ArrayList<>(); + if (searchType.getName().equals("光明区")) { + qyList = enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市"+ searchType.getName() + name) || item.getEnterpriseAddress().startsWith("深圳市光明新区"+ name)).collect(Collectors.toList()); + } else { + qyList = enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市"+ searchType.getName() + name)).collect(Collectors.toList()); + } + List existList = qyList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); + List logoutList = qyList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + s.setName(name); + s.setTotalNumber(qyList.size()); + s.setNumInt(existList.size()); + s.setValue(logoutList.size()); + statisticsIndicatorList.add(s); + } + List qtList=enterpriseInformationList.stream().filter(item->!jdMake(searchType.getName(),jdDictList,item.getEnterpriseAddress())).collect(Collectors.toList()); + if(qtList!=null&&qtList.size()>0) { + List existList = qtList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); + List logoutList = qtList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + StatisticsIndicator s = new StatisticsIndicator(); + s.setName("其他"); + s.setTotalNumber(qtList.size()); + s.setNumInt(existList.size()); + s.setValue(logoutList.size()); + statisticsIndicatorList.add(s); + } + return statisticsIndicatorList; + } + return null; + } + @RequiresPermissions("code:statisticsEnterprise:list") + @GetMapping("/type") + @ResponseBody + public List statistics(SearchType searchType) { + EnterpriseInformation enterpriseInformation=dateMake(searchType); + List enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation); + Listlist=iDictDataService.selectDictDataByType("enterpriseType"); + ListdictDataList=list.subList(0,4);//截取掉其他 + List statisticsIndicatorList=new ArrayList<>(); + for(DictData d:dictDataList){ + List type=enterpriseInformationList.stream().filter(item->item.getCompanyOrgType().contains(d.getDictLabel())).collect(Collectors.toList()); + if(type!=null&&type.size()>0){ + StatisticsIndicator s=new StatisticsIndicator(); + s.setName(d.getDictLabel()); + s.setValue(type.size()); + s.setPercentage((double)type.size()/enterpriseInformationList.size()); + statisticsIndicatorList.add(s); + } + } + List qtList=enterpriseInformationList.stream().filter(item->!typeMake(dictDataList,item.getCompanyOrgType())).collect(Collectors.toList()); + if(qtList!=null&&qtList.size()>0){ + StatisticsIndicator s=new StatisticsIndicator(); + s.setName("其他"); + s.setValue(qtList.size()); + s.setPercentage((double)qtList.size()/enterpriseInformationList.size()); + statisticsIndicatorList.add(s); + } + return statisticsIndicatorList; + } + @RequiresPermissions("code:statisticsEnterprise:view") + @GetMapping("/search") + public String Search(Model model,SearchType searchType) { + EnterpriseInformation enterpriseInformation=dateMake(searchType); + List enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation); + ListdictDataList=iDictDataService.selectDictDataByType("enterpriseType"); + List statisticsIndicatorList=new ArrayList<>(); + for(DictData d:dictDataList){ + List type=enterpriseInformationList.stream().filter(item->item.getCompanyOrgType().contains(d.getDictLabel())).collect(Collectors.toList()); + if(type!=null&&type.size()>0){ + StatisticsIndicator s=new StatisticsIndicator(); + s.setName(d.getDictLabel()); + s.setValue(type.size()); + s.setPercentage((double)type.size()/enterpriseInformationList.size()); + statisticsIndicatorList.add(s); + } + } + model.addAttribute("year",searchType.getYear()); + model.addAttribute("number2",enterpriseInformationList.size());//企业总数--Tap2 + model.addAttribute("number3","100%"); + return prefix+"/enterpriseFragment"; + } + public Boolean qyMake(List stringList,String s){ + for (String string : stringList) { + if (s.startsWith(string)) { + return true; + } + } + return false; + } + public Boolean jdMake(String qy,List stringList,String s){ + if(qy.equals("光明区")){ + for(DictData d:stringList){ + if(s.startsWith("深圳市"+qy+d.getDictLabel())||s.startsWith("深圳市光明新区"+d.getDictLabel())){ + return true; + } + } + }else { + for (DictData d : stringList) { + if (s.startsWith("深圳市"+qy+d.getDictLabel())) { + return true; + } + } + } + return false; + } + public Boolean typeMake(List dictDataList,String s){ + for(DictData d:dictDataList){ + if(s.contains(d.getDictLabel())){ + return true; + } + } + return false; + } + private EnterpriseInformation dateMake(SearchType searchType){ + LocalDate localDate=LocalDate.now(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + if(searchType.getYear()==null||"".equals(searchType.getYear())){ + searchType.setYear(localDate.getYear()+""); + } + EnterpriseInformation enterpriseInformation=new EnterpriseInformation(); + if(searchType.getMonth()!=null&&!"".equals(searchType.getMonth())){ + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(Integer.valueOf(searchType.getMonth())).withDayOfMonth(1); + LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth()); + enterpriseInformation.setBeginTime(str.format(beginTime)); + enterpriseInformation.setEndTime(str.format(endTime)); + }else if(searchType.getQuarter()!=null&&!"".equals(searchType.getQuarter())){ + LocalDate beginTime=LocalDate.now(); + LocalDate endTime=LocalDate.now(); + switch (searchType.getQuarter()){ + case "1": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "2": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(4).withDayOfMonth(1); + endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "3": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(7).withDayOfMonth(1); + endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "4": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(10).withDayOfMonth(1); + endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + break; + } + enterpriseInformation.setBeginTime(str.format(beginTime)); + enterpriseInformation.setEndTime(str.format(endTime)); + }else { + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + enterpriseInformation.setBeginTime(str.format(beginTime)); + enterpriseInformation.setEndTime(str.format(endTime)); + } + return enterpriseInformation; + } + public List yearMake(){ + int current=LocalDate.now().getYear(); + List yearList=new ArrayList<>(); + for(int i=current;i>=2023;i--){ + yearList.add(i); + } + return yearList; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java new file mode 100644 index 00000000..20653aba --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java @@ -0,0 +1,139 @@ +package com.zdxt.code.controller; + +import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.LawEnforcementWarningList; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.service.ILawEnforcementWarningListService; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/code/statisticsWarning") +public class StatisticsWarningController extends BaseController { + private String prefix = "project/code/statisticsWarning"; + @Autowired + private ILawEnforcementWarningListService iLawEnforcementWarningListService; + @RequiresPermissions("code:statisticsWarning:view") + @GetMapping() + public String StatisticsWarning(Model model) + { + LawEnforcementWarningList lawEnforcementWarningList=new LawEnforcementWarningList(); + LocalDate localDate=LocalDate.now(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate beginTime=localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + lawEnforcementWarningList.setBeginTime(str.format(beginTime)); + lawEnforcementWarningList.setEndTime(str.format(endTime)); + List lawEnforcementWarningListList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList1(lawEnforcementWarningList); + int Number1=0; + for(LawEnforcementWarningList l:lawEnforcementWarningListList){ + Number1=Number1+l.getEnforcementNumber(); + } + model.addAttribute("yearList",yearMake()); + model.addAttribute("year",localDate.getYear()); + model.addAttribute("Number1",Number1); + model.addAttribute("Number2",lawEnforcementWarningListList.size()); + return prefix + "/statisticsWarning"; + } + @RequiresPermissions("code:statisticsWarning:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo statisticsWarningList(SearchType searchType) { + LawEnforcementWarningList lawEnforcementWarningList=dateMake(searchType); + if(searchType.getBureauDeptId()!=null&&!"".equals(searchType.getBureauDeptId())){ + lawEnforcementWarningList.setEnforcementDepartment(searchType.getBureauDeptId()); + } + if(searchType.getName()!=null&&!"".equals(searchType.getName())){ + lawEnforcementWarningList.setEnterpriseName(searchType.getName()); + } + startPage(); + List lawEnforcementWarningListList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList1(lawEnforcementWarningList); + return getDataTable(lawEnforcementWarningListList); + } + @RequiresPermissions("code:statisticsWarning:list") + @GetMapping("/searchType") + public String searchType(SearchType searchType,Model model){ + LawEnforcementWarningList lawEnforcementWarningList=dateMake(searchType); + if(searchType.getBureauDeptId()!=null&&!"".equals(searchType.getBureauDeptId())){ + lawEnforcementWarningList.setEnforcementDepartment(searchType.getBureauDeptId()); + } + if(searchType.getName()!=null&&!"".equals(searchType.getName())){ + lawEnforcementWarningList.setEnterpriseName(searchType.getName()); + } + List lawEnforcementWarningListList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList1(lawEnforcementWarningList); + int Number1=0; + for(LawEnforcementWarningList l:lawEnforcementWarningListList){ + Number1=Number1+l.getEnforcementNumber(); + } + model.addAttribute("year",searchType.getYear()); + model.addAttribute("Number1",Number1); + model.addAttribute("Number2",lawEnforcementWarningListList.size()); + return prefix+"/fragmentW"; + } + private LawEnforcementWarningList dateMake(SearchType searchType){ + LocalDate localDate=LocalDate.now(); + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + if(searchType.getYear()==null||"".equals(searchType.getYear())){ + searchType.setYear(localDate.getYear()+""); + } + LawEnforcementWarningList lawEnforcementWarningList =new LawEnforcementWarningList(); + if(searchType.getMonth()!=null&&!"".equals(searchType.getMonth())){ + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(Integer.valueOf(searchType.getMonth())).withDayOfMonth(1); + LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth()); + lawEnforcementWarningList.setBeginTime(str.format(beginTime)); + lawEnforcementWarningList.setEndTime(str.format(endTime)); + }else if(searchType.getQuarter()!=null&&!"".equals(searchType.getQuarter())){ + LocalDate beginTime=LocalDate.now(); + LocalDate endTime=LocalDate.now(); + switch (searchType.getQuarter()){ + case "1": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "2": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(4).withDayOfMonth(1); + endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "3": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(7).withDayOfMonth(1); + endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "4": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(10).withDayOfMonth(1); + endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + break; + } + lawEnforcementWarningList.setBeginTime(str.format(beginTime)); + lawEnforcementWarningList.setEndTime(str.format(endTime)); + }else { + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + lawEnforcementWarningList.setBeginTime(str.format(beginTime)); + lawEnforcementWarningList.setEndTime(str.format(endTime)); + } + return lawEnforcementWarningList; + } + public List yearMake(){ + int current=LocalDate.now().getYear(); + List yearList=new ArrayList<>(); + for(int i=current;i>=2023;i--){ + yearList.add(i); + } + return yearList; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index d1685e0c..a4714a78 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -106,6 +106,8 @@ public class EnterpriseInformation extends BaseDomain * 二维码地址 */ private String qrCodeUrl; + private String beginTime; + private String endTime; public String getReason() { return reason; @@ -305,6 +307,22 @@ public class EnterpriseInformation extends BaseDomain this.qrCodeUrl = qrCodeUrl; } + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + @Override public String getSearchValue() { return searchValue; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java index dd6379b8..3ee6a6aa 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java @@ -8,7 +8,7 @@ import java.text.DecimalFormat; import java.util.List; @Data -public class StatisticsIndicator extends BaseDomain { +public class StatisticsIndicator extends BaseDomain implements Comparable{ private String name; private int value; private int numInt; @@ -24,6 +24,7 @@ public class StatisticsIndicator extends BaseDomain { private List lawEnforcementWarningListList; private List stringList; private String percentage; + private Integer totalNumber; public void setNumDouble(Double numDouble) { this.numDouble = new Double(String.format("%.3f",numDouble)); @@ -32,4 +33,9 @@ public class StatisticsIndicator extends BaseDomain { DecimalFormat str=new DecimalFormat("0.00%"); this.percentage=str.format(numDouble); } + + @Override + public int compareTo(StatisticsIndicator o) { + return this.getValue()-o.getValue(); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java index 7ca9d2f4..31c10d6e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java @@ -34,7 +34,7 @@ public interface EnterpriseInformationMapper * @return 企业信息登记集合 */ List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); - + List selectEnterpriseInformationList1(EnterpriseInformation enterpriseInformation); /** * 查询企业信息以及二维码信息 * @param enterpriseInformation diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java index 293da81f..9459d732 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java @@ -26,7 +26,7 @@ public interface LawEnforcementWarningListMapper * @return 执法预警列表集合 */ List selectLawEnforcementWarningListList(LawEnforcementWarningList lawEnforcementWarningList); - + List selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList); /** * 查询企业预警信息 * @param lawEnforcementWarningList diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java index 2fd7de62..a1e4491b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java @@ -34,6 +34,9 @@ public interface IEnterpriseInformationService * @return 企业信息登记集合 */ List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); + + List selectEnterpriseInformationList1(EnterpriseInformation enterpriseInformation); + /** * 查询企业信息登记列表 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java index 6b9d70fd..cb819e02 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java @@ -27,6 +27,8 @@ public interface ILawEnforcementWarningListService */ List selectLawEnforcementWarningListList(LawEnforcementWarningList lawEnforcementWarningList); + List selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList); + /** * 查询企业预警信息 * @param lawEnforcementWarningList diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java new file mode 100644 index 00000000..904a6732 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java @@ -0,0 +1,4 @@ +package com.zdxt.code.service; + +public interface StatisticalPaneService { +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index 0af3caa4..465d4c18 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -7,11 +7,9 @@ import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.time.Instant; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.temporal.ChronoUnit; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,7 +27,6 @@ import com.zdxt.code.service.IQrCodeGenerateHistoryService; import com.zdxt.code.utils.HttpUtil; import com.zdxt.code.utils.PasswordTools; import com.zdxt.code.utils.QRCodeUtil; -import com.zdxt.code.utils.ServiceInvocation; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -120,7 +117,16 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS // } return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); } - + @Override + public List selectEnterpriseInformationList1(EnterpriseInformation enterpriseInformation) + { +// if ("3".equals(enterpriseInformation.getReason())) { +// Map tmp = new HashMap<>(); +// tmp.put("reason", 3); +// enterpriseInformation.setParams(tmp); +// } + return enterpriseInformationMapper.selectEnterpriseInformationList1(enterpriseInformation); + } @Override public List selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation) { return enterpriseInformationMapper.selectEnterpriseInformationAndQrInfo(enterpriseInformation); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java index 36c07e7c..974f2225 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java @@ -45,6 +45,11 @@ public class LawEnforcementWarningListServiceImpl implements ILawEnforcementWarn { return lawEnforcementWarningListMapper.selectLawEnforcementWarningListList(lawEnforcementWarningList); } + @Override + public List selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList) + { + return lawEnforcementWarningListMapper.selectLawEnforcementWarningListList1(lawEnforcementWarningList); + } @Override public List selectLawEnforcementWarningByEnterpriseNumber(LawEnforcementWarningList lawEnforcementWarningList) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java new file mode 100644 index 00000000..c5278e3b --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java @@ -0,0 +1,8 @@ +package com.zdxt.code.service.impl; + +import com.zdxt.code.service.StatisticalPaneService; +import org.springframework.stereotype.Service; + +@Service +public class StatisticalPaneImpl implements StatisticalPaneService { +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index c38bc454..78129ad8 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + +