Jack/buliang
1
0
Fork 0
forked from zhuyuchen/buliang
Code Pull Requests Activity

后续代码修补

Browse Source
This commit is contained in:
朱豫宸 2025-06-23 23:40:54 +08:00
parent 3d0e9213d4
commit db64324240
9 changed files with 142 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/example/demo/aspectj/LogAspect.java
View File

@ -112,6 +112,7 @@ public class LogAspect {
operLog.setStatus(BusinessStatus.FAIL.ordinal());
operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0));
}
// 设置方法名称
String className = joinPoint.getTarget().getClass().getName();
String methodName = joinPoint.getSignature().getName();

7
src/main/java/com/example/demo/controller/TSJBController.java
View File

@ -171,11 +171,14 @@ public class TSJBController {
@Log(title = "投诉举报(大屏)街道", businessType = BusinessType.SELECT)
@DapingCache(isEnableCache = true)
public ZR<List<TouSuJuBaoLv>> GetTouSuLvDaPingStreetDasai(String hj, String szqx, String month,String street, int littlemonth) {
if("上海市".equals(szqx)){
szqx = null;
}
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
String start = "2022/" + startMonth + "/1";
String end = "2022/" + endMonth + "/31";
String start = "2023/" + startMonth + "/1";
String end = "2023/" + endMonth + "/31";
return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street,littlemonth);
}

3
src/main/java/com/example/demo/controller/TongJiController.java
View File

@ -374,6 +374,9 @@ public class TongJiController {
@Log(title = "抽检监测(大屏)街道", businessType = BusinessType.SELECT)
@DapingCache(isEnableCache = true)
public ZR<List<TongJiHeGeLv>> GetTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street,int littlemonth) {
if("上海市".equals(szqx)){
szqx = null;
}
// 传的月份 + 差的月 作为新的月份
month = Integer.valueOf(month) + littlemonth + "";
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;

6
src/main/java/com/example/demo/controller/YjdpController.java
View File

@ -1,5 +1,6 @@
package com.example.demo.controller;
import com.example.demo.constant.DapingCache;
import com.example.demo.constant.Log;
import com.example.demo.entity.enums.BusinessType;
import com.example.demo.entity.vo.DataTertiaryImportance;
@ -36,8 +37,9 @@ public class YjdpController {
@Resource
private ZhzsPrimaryScorePredictedService zhzsPrimaryScorePredictedService;
//返回指数关系网的全部节点，以及链接
//返回指数关系网的全部节点，以及链接d
@GetMapping("/getRelationshipNetwork")
@DapingCache(isEnableCache = false)
@ApiOperation(value = "预警大屏，指数关系网计算", notes = "返回指数关系网的全部节点，以及链接")
public R<RelationshipNetwork> getRelationshipNetwork() throws Exception {
return R.success(yjdpService.getRelationshipNetwork());
@ -45,6 +47,7 @@ public class YjdpController {
//返回预测的分数
@GetMapping("/getPredictedScores")
@DapingCache(isEnableCache = false)
@ApiOperation(value = "综合指数预警各区分数大屏", notes = "综合指数预警各区分数大屏")
@Log(title = "综合指数预警各区分数大屏", businessType = BusinessType.SELECT)
public R<List<ZSYujingMapVO>> getPredictedScores() throws Exception {
@ -53,6 +56,7 @@ public class YjdpController {
//返回三级指标重要性
@GetMapping("/getTertiaryImportance")
@DapingCache(isEnableCache = false)
@ApiOperation(value = "返回三级指标重要性", notes = "返回三级指标重要性")
@Log(title = "返回三级指标重要性", businessType = BusinessType.SELECT)
public R<List<DataTertiaryImportance>> getTertiaryImportance() {

7
src/main/java/com/example/demo/controller/ZFJCController.java
View File

@ -100,11 +100,14 @@ public class ZFJCController {
@Log(title = "执法检查(大屏)街道", businessType = BusinessType.SELECT)
@DapingCache(isEnableCache = true)
public Object GetWenTiLvDaPingStreetDasai(String hj, String szqx, String month,String street,int littlemonth) {
if("上海市".equals(szqx)){
szqx = null;
}
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
String start = "2022/" + startMonth + "/1";
String end = "2022/" + endMonth + "/31";
String start = "2023/" + startMonth + "/1";
String end = "2023/" + endMonth + "/31";
return zfjcDataService.getWenTiLvDaPingStreetDasai(hj, szqx, start, end,street,littlemonth);
}

4
src/main/java/com/example/demo/service/TsjbDataService.java
View File

@ -73,7 +73,7 @@ public interface TsjbDataService extends IService<TsjbData> {
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
// 解析开始和结束日期
LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
LocalDate end = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
LocalDate end = !ObjectUtils.isEmpty(endTime) ? LocalDate.parse(endTime, dateString) : null;
return getTouSuLvDaPingStreet(start, end, hj, szqx, street);
}
@ -85,7 +85,7 @@ public interface TsjbDataService extends IService<TsjbData> {
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
// 解析开始和结束日期
LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
LocalDate end = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
LocalDate end = !ObjectUtils.isEmpty(endTime) ? LocalDate.parse(endTime, dateString) : null;
start = start.plusMonths(littlemonth);
end = end.plusMonths(littlemonth);
return getTouSuLvDaPingStreet(start, end, hj, szqx, street);

2
src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
View File

@ -685,7 +685,7 @@ public class CjjcServiceImpl implements CjjcService {
@Override
public ZR<List<TongJiHeGeLv>> getTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street) {
String year = "2022";
String year = "2023";
MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(year, month, month, TimeUtil.FORMAT_1);
LocalDate startDataTime = timeByMonth.getStartDataTime();
LocalDate endDataTime = timeByMonth.getEndDataTime();

136
src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js
View File

@ -308,12 +308,9 @@
$scope.DaPingMonths = ['', 1, 2, 3, 4, 5]
$scope.DaPingSzqx = ['',
'闵行区', '青浦区', '长宁区', '宝山区', '嘉定区', '松江区', '静安区', '杨浦区',
'虹口区', '金山区', '徐汇区', '黄浦区', '崇明区', '普陀区', '奉贤区', '浦东新区']
$scope.DaPingSzqx = ['', '闵行区', '青浦区', '长宁区', '宝山区', '嘉定区', '松江区', '静安区', '杨浦区', '虹口区', '金山区', '徐汇区', '黄浦区', '崇明区', '普陀区', '奉贤区', '浦东新区']
$scope.DaPingHj = ['',
'生产环节', '销售环节', '餐饮环节']
$scope.DaPingHj = ['', '生产环节', '销售环节', '餐饮环节']
$scope.DapingCache = function () {
@ -376,28 +373,31 @@
$scope.DasaiCache = function () {
dasaiFetchData();
}
$scope.DasaiMonths = ['', 3, 4, 5]
$scope.DasaiMonths = ['', 1, 3, 5]
$scope.DasaiSzqx = ["上海市",
"奉贤区"
"奉贤区",
"长宁区"
]
$scope.DasaiStreet = ["",
"庄行镇", "金汇镇", "柘林镇", "上海市奉贤区海湾旅游区",
// "青村镇",
// "西渡街道", "四团镇",
// // "金海街道",
// "奉浦街道",
// // "南桥镇",
// "海湾镇", "奉城镇"
// ,"上海海港综合经济开发区"
"金汇镇",
"四团镇",
"西渡街道",
"奉浦街道",
"南桥镇",
"奉城镇",
"庄行镇",
"虹桥街道",
"新泾镇",
"北新泾街道",
]
$scope.DaaiHj = [''
]
$scope.DasaiLittlemonth = [-1, 1, 2, 0
$scope.DasaiLittlemonth = [-2, -1, 0, 1
]
async function dasaiFetchData() {
@ -417,11 +417,109 @@
await $http.get(Gaddress + '/TongJi/GetTongJiHeGeLvDaPingStreetDasai?month=' + $scope.DasaiMonths[i] + '&hj='
+ $scope.DaaiHj[k] + '&szqx=' + $scope.DasaiSzqx[j] + '&street=' + $scope.DasaiStreet[j]
+ '&littlemonth=' + $scope.DasaiLittlemonth[j]);
}
}
}
}
}
$scope.DaPingMonths2 = [5, 4, 3, 2, 1, '']
$scope.DaPingSzqx2 = [
'奉贤区',
'长宁区',
'黄浦区',
// '徐汇区',
// '静安区',
// '嘉定区',
// '宝山区',
// '崇明区',
// '普陀区',
// '杨浦区',
// '松江区',
// '虹口区',
// '金山区',
// '闵行区',
// '青浦区',
// '浦东新区'
]
// 假设有一个街道映射，定义了每个 DaPingSzqx2 对应的 DaPingStreet2
let streetMapping = {
'奉贤区': ['', '海湾旅游区', '上海海港综合经济开发区', '南桥镇', '四团镇', '奉城镇', '奉浦街道', '庄行镇', '柘林镇', '海湾镇', '西渡街道', '金汇镇', '金海街道', '青村镇'],
'长宁区': ['', '新华路街道', '华阳路街道', '虹桥街道', '周家桥街道', '北新泾街道', '江苏路街道', '程家桥街道', '新泾镇', '天山路街道', '仙霞新村街道', '菊园新区管委会'],
'黄浦区': ['', '打浦桥街道', '老西门街道', '外滩街道', '豫园街道', '提篮桥街道', '五里桥街道', '小东门街道', '淮海中路街道', '半淞园路街道', '南京东路街道', '瑞金二路街道'],
'徐汇区': ['', '凌云路街道', '华泾镇', '天平路街道', '康健新村街道', '徐家汇街道', '斜土路街道', '枫林路街道', '湖南路街道', '漕河泾新兴技术开发区', '漕河泾街道', '田林街道', '菊园新区管委会', '虹梅路街道', '长桥街道', '龙华街道'],
'静安区': ['', '江宁路街道', '曹家渡街道', '大宁路街道', '北站街道', '彭浦镇', '静安寺街道', '临汾路街道', '宝山路街道', '南京西路街道', '石门二路街道', '共和新路街道', '天目西路街道', '芷江西路街道', '彭浦新村街道'],
'嘉定区': ['', '华亭镇', '南翔镇', '嘉定工业区', '嘉定镇街道', '外冈镇', '安亭镇', '徐行镇', '新成路街道', '江桥镇', '真新街道', '菊园新区管委会', '马陆镇'],
'宝山区': ['', '友谊路街道', '吴淞街道', '大场镇', '宝山城市工业园区', '庙行镇', '张庙街道', '月浦镇', '杨行镇', '淞南镇', '罗店镇', '罗泾镇', '菊园新区管委会', '顾村镇', '高境镇'],
'崇明区': ['', '三星镇', '东平镇', '中兴镇', '向化镇', '城桥镇', '堡镇', '庙镇', '建设镇', '新村乡', '新河镇', '新海镇', '横沙乡', '港沿镇', '港西镇', '竖新镇', '绿华镇', '长兴镇', '陈家镇'],
'普陀区': ['', '万里街道', '宜川路街道', '曹杨新村街道', '桃浦镇', '甘泉路街道', '真如镇街道', '石泉路街道', '长寿路街道', '长征镇', '长风新村街道'],
'杨浦区': ['', '五角场街道', '四平路街道', '大桥街道', '定海路街道', '平凉路街道', '延吉新村街道', '控江路街道', '新江湾城街道', '殷行街道', '江浦路街道', '长白新村街道'],
'松江区': ['', '中山街道', '九亭镇', '九里亭街道', '佘山镇', '叶榭镇', '小昆山镇', '岳阳街道', '广富林街道', '新桥镇', '新浜镇', '方松街道', '永丰街道', '泖港镇', '泗泾镇', '洞泾镇', '石湖荡镇', '车墩镇'],
'虹口区': ['', '凉城新村街道', '北外滩街道', '嘉兴路街道', '四川北路街道', '广中路街道', '提篮桥街道', '曲阳路街道', '欧阳路街道', '江湾镇街道'],
'金山区': ['', '亭林镇', '吕巷镇', '山阳镇', '廊下镇', '张堰镇', '朱泾镇', '枫泾镇', '漕泾镇', '石化街道', '金山卫镇', '金山工业区'],
'闵行区': ['', '七宝镇', '华漕镇', '古美路街道', '吴泾镇', '提篮桥街道', '新虹街道', '梅陇镇', '江川路街道', '浦江镇', '浦锦街道', '莘庄工业区', '莘庄镇', '虹桥镇', '颛桥镇', '马桥镇'],
'青浦区': ['', '华新镇', '夏阳街道', '徐泾镇', '朱家角镇', '白鹤镇', '盈浦街道', '练塘镇', '赵巷镇', '重固镇', '金泽镇', '香花桥街道'],
'浦东新区': ['', '万祥镇', '三林镇', '上钢新村街道', '东明路街道', '书院镇', '北蔡镇', '南汇新城镇', '南码头路街道', '合庆镇', '周家渡街道', '周浦镇', '唐镇', '塘桥街道', '大团镇', '宣桥镇', '川沙新镇', '康桥镇', '张江镇', '惠南镇', '提篮桥街道', '新场镇', '曹路镇', '沪东新村街道', '泥城镇', '洋泾街道', '浦兴路街道', '潍坊新村街道', '祝桥镇', '老港镇', '航头镇', '花木街道', '菊园新区管委会', '金杨新村街道', '金桥经济技术开发区', '金桥镇', '陆家嘴街道', '高东镇', '高桥镇', '高行镇'],
};
$scope.DaPingHj2 = ['', '生产环节', '销售环节', '餐饮环节']
$scope.DapingCache2 = function () {
FetchData2();
}
async function FetchData2() {
for (let j = 0; j < $scope.DaPingSzqx2.length; j++) {
let currentSzqx = $scope.DaPingSzqx2[j];
let correspondingStreets = streetMapping[currentSzqx]; // 获取当前 szqx 对应的街道
// if (correspondingStreets) {
if (true) {
for (let m = 0; m < correspondingStreets.length; m++) { // 遍历对应的街道
let currentStreet = correspondingStreets[m];
// 遍历月
for (let i = 0; i < $scope.DaPingMonths2.length; i++) {
// 遍历环节
for (let k = 0; k < $scope.DaPingHj2.length; k++) {
await $http.get(Gaddress + '/TongJi/GetTongJiHeGeLvDaPingStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
await $http.get(Gaddress + '/XZCF/GetFaShengLvDaPingStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
await $http.get(Gaddress + '/CCKH/GetKaoHeDaPing?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
await $http.get(Gaddress + '/TSJB/GetTouSuLvDaPingStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
await $http.get(Gaddress + '/XXZS/GetZhuiSuDaPingStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
await $http.get(Gaddress + '/ZFJC/GetWenTiLvDaPingStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
+ $scope.DaPingHj2[k] + '&szqx=' + currentSzqx + '&street=' + currentStreet);
// await $http.get(Gaddress + '/ZHZS/GetScoreNewStreet?month=' + $scope.DaPingMonths2[i] + '&hj='
// + $scope.DaPingHj2[k] + '&szqx=' + currentSzqx+ '&street=' + currentStreet);
debugger;
}
}
}
}
// for (let i = 0; i < $scope.DaPingMonths.length; i++) {
// await $http.get(Gaddress + '/ZHZS/GetZHScoreDaPing?szqx=' + $scope.DaPingSzqx[i]);
// }
//
// for (let i = 0; i < $scope.DaPingMonths.length; i++) {
// for (let k = 0; k < $scope.DaPingHj.length; k++) {
// await $http.get(Gaddress + '/ZHZS/GetScoreNew?month=' + $scope.DaPingMonths[i] + '&hj='
// + $scope.DaPingHj[k]);
// }
// }
}
@ -1929,7 +2027,7 @@
return month;
}
}
}
])
])

2
src/main/resources/public/app/yujing/view/dataBuhegelv.html
View File

@ -132,6 +132,8 @@
<button class="btn-warning" ng-click="DapingCache()" ng-disabled="isLoadCache">大屏缓存</button>
<button class="btn-warning" ng-click="DapingCache2()" ng-disabled="isLoadCache">大屏缓存2</button>
<button class="btn-warning" ng-click="DasaiCache()" ng-disabled="isLoadCache">大赛缓存</button>
<!--<button class="btn-success" ng-click="test1(1)">操作测试</button>-->
<!--<button class="btn-warning" ng-click="TestData()">测试数据加载</button>-->