nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

This commit is contained in:
廖成初 2026-01-04 21:27:45 +08:00
parent 3813a91563 9cd671dc78
commit 8af4336aa6
5 changed files with 201 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aiceps-service-server-menu.sql
View File

@ -7,21 +7,21 @@ set REMARK = '12'
where SYSMENUID='74ad1a52-a1b8-456b-a3e7-3249d69a1d50';
-- 新增菜单
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('6b6649ec-86a5-4424-b7af-d542af33bc26','1','resource','年报主体精准监管','NBFW','/aiceps-service-web','','10',1,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('5dbd7970-ffc7-40ac-aa33-f787c90c2e19','1','resource','精细化分级管理','NBFW:JXH','/fineClassificated/jingXiHuaFenxJiGuanLi','6b6649ec-86a5-4424-b7af-d542af33bc26','0',2,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('d1244741-47bb-4fc1-869d-875917d85497','1','resource','主体分类管理','NBFW:JXH:JTFL','/index','5dbd7970-ffc7-40ac-aa33-f787c90c2e19','0',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('cee33480-ddda-452f-8ce2-eab0d7438561','1','resource','分时段年报申报管理','NBFW:JXH:SBGL','/fenShiDuanNianBaoShenBao','5dbd7970-ffc7-40ac-aa33-f787c90c2e19','1',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('61e74b93-09e7-4011-af4e-02d04a0ced70','1','resource','年报统一管理','NBFW:TYGL','/annualReportService/unifiedMGT','6b6649ec-86a5-4424-b7af-d542af33bc26','1',2,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('0f0653e7-a82b-4c84-9d2f-f3b635a9af71','1','resource','年报进度查询','NBFW:TYGL:JDCX','/annualReportProgress','61e74b93-09e7-4011-af4e-02d04a0ced70','0',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('e07d48e6-a29b-4581-820e-5c07579b6abd','1','resource','年报申报提醒管理','NBFW:TYGL:SBTX','/nianBaoFenXi','61e74b93-09e7-4011-af4e-02d04a0ced70','1',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('7c3b2d1d-53f5-4dbe-a987-a8d412e0546e','1','resource','年报分析','NBFW:TYGL:NBFX','/qiYeCuiBao','61e74b93-09e7-4011-af4e-02d04a0ced70','2',3,null,99);
-- 账号授权

5
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java
View File

@ -240,8 +240,9 @@ public class TSBizSerIllegalRemServiceImpl extends BaseServiceImpl<TSBizSerIlleg
// 生成列异决定书附件
HashMap<String, Object> map = new HashMap<>();
String areaName = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
areaName = areaName.contains("广州市") ? areaName : ("广州市" + areaName);
String areaNameq = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00");
String areaName = nmSareaName + areaNameq;
map.put("areaName", areaName);
map.put("writsNo", tsWritModel.getWritsno());
map.put("htmlContent", tsWritModel.getContent());

236
src/main/java/com/chinaweal/aiccs/common/constant/Constant.java
View File

@ -94,10 +94,15 @@ public abstract class Constant {
public static final String[] NOT_COMPANY_TYPE = {"8000","8100","8200","8300","9000","9100","9200","9910","99100","99101","99102","99103","9999"};
/**
* 广州行政地区码值
* nm行政地区码值
*/
public static final Map<String, String> GZ_REGION_CODE = new LinkedHashMap<>();
/**
* nm市码值
*/
public static final Map<String, String> NM_REGION_CODE = new LinkedHashMap<>();
/**
* 广州行政地区码值及简称
*/
@ -159,57 +164,192 @@ public abstract class Constant {
public static final Map<String, String> GZ_LY_DH = new LinkedHashMap<>();
static {
GZ_REGION_CODE.put("440101", "广州市");
GZ_REGION_CODE.put("440100", "广州市");
GZ_REGION_CODE.put("440103", "荔湾区");
GZ_REGION_CODE.put("440104", "越秀区");
GZ_REGION_CODE.put("440105", "海珠区");
GZ_REGION_CODE.put("440106", "天河区");
GZ_REGION_CODE.put("440111", "白云区");
GZ_REGION_CODE.put("440112", "黄埔区");
GZ_REGION_CODE.put("440113", "番禺区");
GZ_REGION_CODE.put("440126", "番禺区");
GZ_REGION_CODE.put("440114", "花都区");
GZ_REGION_CODE.put("440121", "花都区");
GZ_REGION_CODE.put("440115", "南沙区");
GZ_REGION_CODE.put("440110", "南沙区");
GZ_REGION_CODE.put("440117", "从化区");
GZ_REGION_CODE.put("440122", "从化区");
GZ_REGION_CODE.put("440118", "增城区");
GZ_REGION_CODE.put("440125", "增城区");
GZ_REGION_CODE.put("150102", "新城区");
GZ_REGION_CODE.put("150103", "回民区");
GZ_REGION_CODE.put("150104", "玉泉区");
GZ_REGION_CODE.put("150105", "赛罕区");
GZ_REGION_CODE.put("150118", "和林格尔新区");
GZ_REGION_CODE.put("150121", "土默特左旗");
GZ_REGION_CODE.put("150122", "托克托县");
GZ_REGION_CODE.put("150123", "和林格尔县");
GZ_REGION_CODE.put("150124", "清水河县");
GZ_REGION_CODE.put("150125", "武川县");
GZ_REGION_CODE.put("150173", "和林格尔县");
GZ_REGION_CODE.put("150191", "金川开发区");
GZ_REGION_CODE.put("150192", "经济开发区");
GZ_REGION_CODE.put("150202", "东河区");
GZ_REGION_CODE.put("150203", "昆都仑区");
GZ_REGION_CODE.put("150204", "青山区");
GZ_REGION_CODE.put("150205", "石拐区");
GZ_REGION_CODE.put("150206", "白云区");
GZ_REGION_CODE.put("150207", "九原区");
GZ_REGION_CODE.put("150221", "土默特右旗");
GZ_REGION_CODE.put("150222", "固阳县");
GZ_REGION_CODE.put("150223", "达茂联合旗");
GZ_REGION_CODE.put("150291", "");
GZ_REGION_CODE.put("150302", "海勃湾区");
GZ_REGION_CODE.put("150303", "海南区");
GZ_REGION_CODE.put("150304", "乌达区");
GZ_REGION_CODE.put("150402", "红山区");
GZ_REGION_CODE.put("150403", "元宝山区");
GZ_REGION_CODE.put("150404", "松山区");
GZ_REGION_CODE.put("150421", "阿鲁科尔沁旗");
GZ_REGION_CODE.put("150422", "巴林左旗");
GZ_REGION_CODE.put("150423", "巴林右旗");
GZ_REGION_CODE.put("150424", "林西县");
GZ_REGION_CODE.put("150425", "克什克腾旗");
GZ_REGION_CODE.put("150426", "翁牛特旗");
GZ_REGION_CODE.put("150428", "喀喇沁旗");
GZ_REGION_CODE.put("150429", "宁城县");
GZ_REGION_CODE.put("150430", "敖汉旗");
GZ_REGION_CODE.put("150502", "科尔沁区");
GZ_REGION_CODE.put("150521", "科尔沁左翼中旗");
GZ_REGION_CODE.put("150522", "科尔沁左翼后旗");
GZ_REGION_CODE.put("150523", "开鲁县");
GZ_REGION_CODE.put("150524", "库伦旗");
GZ_REGION_CODE.put("150525", "奈曼旗");
GZ_REGION_CODE.put("150526", "扎鲁特旗");
GZ_REGION_CODE.put("150581", "霍林郭勒市");
GZ_REGION_CODE.put("150591", "经开区");
GZ_REGION_CODE.put("150602", "东胜区");
GZ_REGION_CODE.put("150621", "达拉特旗");
GZ_REGION_CODE.put("150622", "准格尔旗");
GZ_REGION_CODE.put("150623", "鄂托克前旗");
GZ_REGION_CODE.put("150624", "鄂托克旗");
GZ_REGION_CODE.put("150625", "杭锦旗");
GZ_REGION_CODE.put("150626", "乌审旗");
GZ_REGION_CODE.put("150627", "");
GZ_REGION_CODE.put("150691", "");
GZ_REGION_CODE.put("150692", "");
GZ_REGION_CODE.put("150693", "");
GZ_REGION_CODE.put("150702", "海拉尔区");
GZ_REGION_CODE.put("150703", "扎赉诺尔区");
GZ_REGION_CODE.put("150721", "阿荣旗");
GZ_REGION_CODE.put("150722", "莫旗");
GZ_REGION_CODE.put("150723", "鄂伦春自治旗");
GZ_REGION_CODE.put("150724", "鄂温克族自治旗");
GZ_REGION_CODE.put("150725", "陈巴尔虎旗");
GZ_REGION_CODE.put("150726", "新巴尔虎左旗");
GZ_REGION_CODE.put("150727", "新巴尔虎右旗");
GZ_REGION_CODE.put("150781", "满洲里市");
GZ_REGION_CODE.put("150782", "牙克石");
GZ_REGION_CODE.put("150783", "扎兰屯市");
GZ_REGION_CODE.put("150784", "额尔古纳市");
GZ_REGION_CODE.put("150785", "根河市");
GZ_REGION_CODE.put("150788", "经开区");
GZ_REGION_CODE.put("150791", "满洲里市");
GZ_REGION_CODE.put("150802", "临河区");
GZ_REGION_CODE.put("150821", "五原县");
GZ_REGION_CODE.put("150822", "磴口县");
GZ_REGION_CODE.put("150823", "乌拉特前旗");
GZ_REGION_CODE.put("150824", "乌拉特中旗");
GZ_REGION_CODE.put("150825", "乌拉特后旗");
GZ_REGION_CODE.put("150826", "杭锦后旗");
GZ_REGION_CODE.put("150881", "");
GZ_REGION_CODE.put("150891", "");
GZ_REGION_CODE.put("150902", "集宁区");
GZ_REGION_CODE.put("150921", "卓资县");
GZ_REGION_CODE.put("150922", "化德县");
GZ_REGION_CODE.put("150923", "商都县");
GZ_REGION_CODE.put("150924", "兴和县");
GZ_REGION_CODE.put("150925", "凉城县");
GZ_REGION_CODE.put("150926", "察哈尔右翼前旗");
GZ_REGION_CODE.put("150927", "察哈尔右翼中旗");
GZ_REGION_CODE.put("150928", "察哈尔右翼后旗");
GZ_REGION_CODE.put("150929", "四子王旗");
GZ_REGION_CODE.put("150981", "丰镇市");
GZ_REGION_CODE.put("150982", "");
GZ_REGION_CODE.put("150992", "");
GZ_REGION_CODE.put("150993", "");
GZ_REGION_CODE.put("152201", "乌兰浩特市");
GZ_REGION_CODE.put("152202", "阿尔山市");
GZ_REGION_CODE.put("152221", "科尔沁右翼前旗");
GZ_REGION_CODE.put("152222", "科尔沁右翼中旗");
GZ_REGION_CODE.put("152223", "扎赉特旗");
GZ_REGION_CODE.put("152224", "突泉县");
GZ_REGION_CODE.put("152282", "");
GZ_REGION_CODE.put("152501", "二连浩特市");
GZ_REGION_CODE.put("152502", "锡林浩特市");
GZ_REGION_CODE.put("152522", "阿巴嘎旗");
GZ_REGION_CODE.put("152523", "苏尼特左旗");
GZ_REGION_CODE.put("152524", "苏尼特右旗");
GZ_REGION_CODE.put("152525", "东乌珠穆沁旗");
GZ_REGION_CODE.put("152526", "西乌珠穆沁旗");
GZ_REGION_CODE.put("152527", "太仆寺旗");
GZ_REGION_CODE.put("152528", "镶黄旗");
GZ_REGION_CODE.put("152529", "正镶白旗");
GZ_REGION_CODE.put("152530", "正蓝旗");
GZ_REGION_CODE.put("152531", "多伦县");
GZ_REGION_CODE.put("152591", "乌拉盖管理区");
GZ_REGION_CODE.put("152921", "阿拉善左旗");
GZ_REGION_CODE.put("152922", "阿拉善右旗");
GZ_REGION_CODE.put("152923", "");
GZ_REGION_CODE.put("152991", "");
GZ_REGION_CODE.put("152992", "");
GZ_REGION_CODE.put("155105", "赛罕区");
GZ_REGION_CODE.put("157992", "");
GZ_REGION_CODE_SHORTNAME.put("440101","穗");
GZ_REGION_CODE_SHORTNAME.put("440100","穗");
GZ_REGION_CODE_SHORTNAME.put("440103","荔");
GZ_REGION_CODE_SHORTNAME.put("440104","越");
GZ_REGION_CODE_SHORTNAME.put("440105","海");
GZ_REGION_CODE_SHORTNAME.put("440106","天");
GZ_REGION_CODE_SHORTNAME.put("440111","白");
GZ_REGION_CODE_SHORTNAME.put("440112","黄");
GZ_REGION_CODE_SHORTNAME.put("440113","番");
GZ_REGION_CODE_SHORTNAME.put("440126","番");
GZ_REGION_CODE_SHORTNAME.put("440114","花");
GZ_REGION_CODE_SHORTNAME.put("440121","花");
GZ_REGION_CODE_SHORTNAME.put("440115","南");
GZ_REGION_CODE_SHORTNAME.put("440110","南");
GZ_REGION_CODE_SHORTNAME.put("440117","从");
GZ_REGION_CODE_SHORTNAME.put("440122","从");
GZ_REGION_CODE_SHORTNAME.put("440118","增");
GZ_REGION_CODE_SHORTNAME.put("440125","增");
NM_REGION_CODE.put("150100", "呼和浩特市");
NM_REGION_CODE.put("150200", "包头市");
NM_REGION_CODE.put("150300", "乌海市");
NM_REGION_CODE.put("150400", "赤峰市");
NM_REGION_CODE.put("150500", "通辽市");
NM_REGION_CODE.put("150600", "鄂尔多斯市");
NM_REGION_CODE.put("150700", "呼伦贝尔市");
NM_REGION_CODE.put("150800", "巴彦淖尔市");
NM_REGION_CODE.put("150900", "乌兰察布市");
NM_REGION_CODE.put("152200", "兴安盟");
NM_REGION_CODE.put("152300", "包头市");
NM_REGION_CODE.put("152500", "锡林郭勒盟");
NM_REGION_CODE.put("152900", "阿拉善盟");
NM_REGION_CODE.put("155100", "呼和浩特市");
NM_REGION_CODE.put("155500", "通辽市");
NM_REGION_CODE.put("155600", "鄂尔多斯市");
NM_REGION_CODE.put("155900", "乌兰察布市");
NM_REGION_CODE.put("157900", "阿拉善盟");
GZ_REGION_CODE_SHORTNAME.put("150100", "呼");
GZ_REGION_CODE_SHORTNAME.put("150200", "包");
GZ_REGION_CODE_SHORTNAME.put("150300", "乌");
GZ_REGION_CODE_SHORTNAME.put("150400", "赤");
GZ_REGION_CODE_SHORTNAME.put("150500", "通");
GZ_REGION_CODE_SHORTNAME.put("150600", "鄂");
GZ_REGION_CODE_SHORTNAME.put("150700", "呼伦");
GZ_REGION_CODE_SHORTNAME.put("150800", "巴");
GZ_REGION_CODE_SHORTNAME.put("150900", "乌兰");
GZ_REGION_CODE_SHORTNAME.put("152200", "兴安");
GZ_REGION_CODE_SHORTNAME.put("152300", "包");
GZ_REGION_CODE_SHORTNAME.put("152500", "锡林");
GZ_REGION_CODE_SHORTNAME.put("152900", "阿拉");
GZ_REGION_CODE_SHORTNAME.put("155100", "呼");
GZ_REGION_CODE_SHORTNAME.put("155500", "通");
GZ_REGION_CODE_SHORTNAME.put("155600", "鄂");
GZ_REGION_CODE_SHORTNAME.put("155900", "乌兰");
GZ_REGION_CODE_SHORTNAME.put("157900", "阿拉");
// GZ_DECORG_CODE.put("44010000", "广州市");
GZ_DECORG_CODE.put("44010300", "荔湾");
GZ_DECORG_CODE.put("44010400", "越秀");
GZ_DECORG_CODE.put("44010500", "海珠");
GZ_DECORG_CODE.put("44010600", "天河");
GZ_DECORG_CODE.put("44011100", "白云");
GZ_DECORG_CODE.put("44011200", "黄埔");
GZ_DECORG_CODE.put("44012600", "番禺");
GZ_DECORG_CODE.put("44012100", "花都");
GZ_DECORG_CODE.put("44099000", "南沙");
GZ_DECORG_CODE.put("44012200", "从化");
GZ_DECORG_CODE.put("44012500", "增城");
GZ_DECORG_CODE.put("15010000", "呼和浩特市");
GZ_DECORG_CODE.put("15020000", "包头市");
GZ_DECORG_CODE.put("15030000", "乌海市");
GZ_DECORG_CODE.put("15040000", "赤峰市");
GZ_DECORG_CODE.put("15050000", "通辽市");
GZ_DECORG_CODE.put("15060000", "鄂尔多斯市");
GZ_DECORG_CODE.put("15070000", "呼伦贝尔市");
GZ_DECORG_CODE.put("15080000", "巴彦淖尔市");
GZ_DECORG_CODE.put("15090000", "乌兰察布市");
GZ_DECORG_CODE.put("15220000", "兴安盟");
GZ_DECORG_CODE.put("15230000", "包头市");
GZ_DECORG_CODE.put("15250000", "锡林郭勒盟");
GZ_DECORG_CODE.put("15290000", "阿拉善盟");
GZ_DECORG_CODE.put("15510000", "呼和浩特市");
GZ_DECORG_CODE.put("15550000", "通辽市");
GZ_DECORG_CODE.put("15560000", "鄂尔多斯市");
GZ_DECORG_CODE.put("15590000", "乌兰察布市");
GZ_DECORG_CODE.put("15790000", "阿拉善盟");
REPAIR_ILLEGAL_DEADLINE.put(REPAIR_ILLEGAL_DEADLINE_ACCEPT,"4");
REPAIR_ILLEGAL_DEADLINE.put(REPAIR_ILLEGAL_DEADLINE_HANDLE,"3");

2
src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java
View File

@ -182,7 +182,7 @@ public class TUsermenuController extends BaseController {
userMenusDto.setPath(sysMenu.getResourceURL());
userMenusDto.setLevel(sysMenu.getOrgLevel());
userMenusDto.setChildren(new ArrayList<UserMenusDto>());
if (StringUtils.isNotEmpty(sysMenu.getRemark())) {
if (StringUtils.isNotEmpty(sysMenu.getRemark()) && StringUtils.isNumeric(sysMenu.getRemark())) {
userMenusDto.setNo(Integer.valueOf(sysMenu.getRemark()));
} else {
userMenusDto.setNo(0);

1
src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
View File

@ -655,6 +655,7 @@ public class UserController extends BaseController {
@GetMapping("/listUserByPermissionAndOrgIds")
public RestResult<List<AICUser>> listUserByPermissionAndOrgIds(String permission, String orgId, Boolean isArea, HttpServletRequest request) {
AICUser loginUser = getLoginUser(request);
orgId = loginUser.getOrgID().substring(0, 4) + "00";
List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
return RestResult.ok(userList);
}