JiangPengLi 3 сар өмнө
parent
commit
8164a08899

+ 2 - 2
projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/mapper/SecRoleMapper.xml

@@ -4,11 +4,11 @@
 
 	<select id="queryMenuCodeByRoleId" resultType="String">
 		SELECT b.`code` FROM sec_rolemenu a left join menu_info b on a.menu_id = b.id
-		where a.roleinfo_id = #{roleId} AND b.type = #{menuType} AND a.logic_delete_flag = 0 and b.logic_delete_flag = 0
+		where a.roleinfo_id = #{roleId} AND b.type = #{menuType} AND a.logic_delete_flag = 0 and b.logic_delete_flag = 0 and a.kind = 2
 		GROUP BY a.`code`
 	</select>
 	<select id="queryAllMenuCode" resultType="String">
-		SELECT code FROM menu_info WHERE type = #{menuType} and logic_delete_flag = 0
+		SELECT code FROM menu_info WHERE type = #{menuType} and logic_delete_flag = 0 and kind = 2
 
 	</select>
 </mapper>

+ 3 - 0
projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/servicel/impl/SecRoleserviceimpl.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import com.rtrh.projects.util.TargetDataSource;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
@@ -189,11 +190,13 @@ public class SecRoleserviceimpl implements SecRoleservice {
     }
 
 	@Override
+    @TargetDataSource("secondary")
 	public List<String> queryMenuCodesByRoleId(String id, MenuType type) {
 		return secRoleMapper.queryMenuCodeByRoleId(id, type.getCode());
 	}
 
 	@Override
+    @TargetDataSource("secondary")
 	public List<String> queryAllMenuCode( MenuType type) {
 
 		return secRoleMapper.queryAllMenuCode(type.getCode());

+ 1 - 1
projects/src/main/java/com/rtrh/projects/web/controller/passport/api/SwitchApiController.java

@@ -18,7 +18,7 @@ import java.io.IOException;
 import java.util.ResourceBundle;
 
 @RestController
-@RequestMapping("/app/switch")
+@RequestMapping("api/app/switch")
 public class SwitchApiController extends BaseController {
 
     /**

+ 1 - 0
projects/src/main/resources/rtrh-crypto.xml

@@ -17,6 +17,7 @@
 				<value>/outApi/preFlow/img</value>
 				<value>/outApi/projects/statics/yearReport</value>
 				<value>/outApi/subInfoExport/**</value>
+				<value>/outApi/auth/gxjLogin</value>
 				<value>/pdfHtml/**</value>
 			</list>
 		</property>

+ 3 - 353
projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -46,7 +46,6 @@
             buttonActive2: 1,
             menuCode: "${menuCode}".split(","),
             navLs: [
-                /* {icon: 'icon_big_screen_active',activeIcon:'icon_big_screen_active', code: '101', txt: '分析大屏',url: 'statics/analysisScreen'}, */
                 {
                     icon: 'icon_big_screen_active',
                     activeIcon: 'icon_big_screen_active',
@@ -123,16 +122,6 @@
                             code: '301',
                             url: 'subject/subInfo/report'
                         },
-                        // {
-                        //     txt: '项目审核',
-                        //     code: '302',
-                        //     url: 'subject/apply/spList'/* ?type=qx */
-                        // },
-                        // {
-                        //     code: '304',
-                        //     txt: '前期手续办理情况评价',
-                        //     url: 'subject/subInfo/projTz?type=prePj',
-                        // },
                         {
                             txt: '前期手续办理情况',
                             code: '303',
@@ -172,141 +161,14 @@
                         },
                         {
                             txt: '投产项目',
-                            code: '1101',
+                            code: '1104',
                             url: 'subject/subInfo/projTz?type=yearSum',
                             before: function () {
                                 window.localStorage.removeItem("TzQueryParam_yearSum_${loginUserId}")
                             }
                         },
-                        <%--                    <c:forEach items="${zjlyList}" var="li" varStatus="lis">--%>
-                        <%--                        {--%>
-                        <%--                            txt: '${li.title}',--%>
-                        <%--                            code: '${li.code}',--%>
-                        <%--                            url: 'subject/subInfo/projZj?code=${li.code}&title=${li.title}',--%>
-                        <%--                        },--%>
-                        <%--                        </c:forEach>--%>
-<%--                        <c:forEach items="${zjlyList}" var="li" varStatus="lis">--%>
-<%--                        <c:choose>--%>
-<%--                        <c:when test="${li.code == '1999' && li.title == '重点投资项目'}">--%>
-<%--                        {--%>
-<%--                            txt: '重点投资项目',--%>
-<%--                            code: '1999',--%>
-<%--                            url: 'subject/subInfo/projTz?type=major',--%>
-<%--                        },--%>
-<%--                        </c:when>--%>
-<%--                        <c:when test="${li.code == '104' && li.title == '援疆资金'}">--%>
-<%--                        {--%>
-<%--                            txt: '${li.title}',--%>
-<%--                            code: '${li.code}',--%>
-<%--                            url: 'non/fixed/investment/yjzj',--%>
-<%--                        },--%>
-<%--                        </c:when>--%>
-<%--                        <c:otherwise>--%>
-<%--                        {--%>
-<%--                            txt: '${li.title}',--%>
-<%--                            code: '${li.code}',--%>
-<%--                            /*                     url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}',*/--%>
-<%--                            url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}&statusZj=1',--%>
-<%--                        },--%>
-<%--                        </c:otherwise>--%>
-<%--                        </c:choose>--%>
-<%--                        </c:forEach>--%>
-                        /*            {
-                                        txt: '重点投资项目',
-                                        code: '404',
-                                        url: 'subject/subInfo/projTz?type=major',
-                                    },*/
-
-                        /* {
-                        txt: '中央预算内资金项目',
-                        code: '404',
-                        url: 'subject/subInfo/projTz?type=6',
-                        },
-                        {
-                        txt: '援疆资金项目',
-                        code: '405',
-                        url: 'subject/subInfo/projTz?type=7',
-                        },
-                        {
-                        txt: '总投资10亿元以上项目',
-                        code: '1001',
-                        url: 'subject/subInfo/projTz?type=9',
-                        },
-                        {
-                        txt: '以工代赈项目',
-                        code: '1002',
-                        url: 'subject/subInfo/projTz?type=10',
-                        },/!*, {
-                        txt: (year-1)+'年增发国债',
-                        code: '1003',
-                        url: 'subject/subInfo/projTz?type=11',
-                        },*!/
-                        {
-                        txt: year+'年超长期国债',
-                        code: '1004',
-                        url: 'subject/subInfo/projTz?type=12',
-                        }
-                        ,
-                        {
-                        txt: '地方政府专项债资金',
-                        code: '1005',
-                        url: 'subject/subInfo/projTz?type=13',
-                        }*/
                     ]
                 },
-                <%--{--%>
-                <%--    icon: 'icon_project_active',--%>
-                <%--    activeIcon: 'icon_project_active',--%>
-                <%--    code: '11',--%>
-                <%--    txt: '年度固定资产项目库',--%>
-                <%--    child: [--%>
-                <%--        {--%>
-                <%--            txt: '汇总项目',--%>
-                <%--            code: '1101',--%>
-                <%--            url: 'subject/subInfo/projTz?type=yearSum',--%>
-                <%--            before: function () {--%>
-                <%--                window.localStorage.removeItem("TzQueryParam_yearSum_${loginUserId}")--%>
-                <%--            }--%>
-                <%--        },--%>
-                <%--        {--%>
-                <%--            txt: '新建项目',--%>
-                <%--            code: '1101',--%>
-                <%--            url: 'subject/subInfo/projTz?type=yearNew',--%>
-                <%--            before: function () {--%>
-                <%--                window.localStorage.removeItem("TzQueryParam_yearNew_${loginUserId}")--%>
-                <%--            }--%>
-                <%--        },--%>
-                <%--        {--%>
-                <%--            txt: '续建项目',--%>
-                <%--            code: '1102',--%>
-                <%--            url: 'subject/subInfo/projTz?type=yearExtend',--%>
-                <%--            before: function () {--%>
-                <%--                window.localStorage.removeItem("TzQueryParam_yearExtend_${loginUserId}")--%>
-                <%--            }--%>
-                <%--        },--%>
-                <%--        {--%>
-                <%--            txt: '储备项目',--%>
-                <%--            code: '1103',--%>
-                <%--            url: 'subject/subInfo/projTz?type=yearReserve',--%>
-                <%--            before: function () {--%>
-                <%--                window.localStorage.removeItem("TzQueryParam_yearReserve_${loginUserId}")--%>
-                <%--            }--%>
-                <%--        }--%>
-                <%--    ]--%>
-                <%--},--%>
-                // {
-                //     icon: 'icon_over_time_active',
-                //     activeIcon: 'icon_over_time_active',
-                //     code: '2000',
-                //     txt: '竣工验收及项目后评价',
-                //     url: 'subject/subInfo/projTz?type=8',
-                // },
-                /*              {
-                                  icon: 'icon_over_time_active', activeIcon: 'icon_over_time_active',
-                                  code: '5',
-                                  txt: '重点投资项目',
-                                  url: 'subject/subInfo/projTz?type=major',
-                              },*/
                 {
                     icon: 'icon_over_time_active', activeIcon: 'icon_over_time_active',
                     code: '5',
@@ -342,11 +204,6 @@
                     txt: '智联工地',
                     code: '7',
                     child: [
-                        /* {
-                            code: '701',
-                            txt: '智慧工地总览',
-                            url: 'smart/index'
-                        }, */
                         {
                             code: '702',
                             txt: '项目地图',
@@ -374,122 +231,22 @@
 
                     ]
                 },
-                // {
-                //     icon: 'icon_project_active',
-                //     activeIcon: 'icon_project_active',
-                //     code: '8',
-                //     txt: '产业链共享服务',
-                //     url: 'intermediary/list'
-                //     /* child: [
-                //         {
-                //             txt: '产业链服务库列表',
-                //             code: '801',
-                //             url: 'intermediary/list'
-                //         },{
-                //             txt: '产业链服务库统计',
-                //             code: '802',
-                //             url: 'intermediary/statics'
-                //         },
-                //     ] */
-                // },
-
-                // ,{
-                // 	icon: 'icon_project_zjfwk_active',
-                // 	activeIcon:'icon_project_zjfwk_active',
-                // 	txt: '产业链服务库',
-                // 	code: '11',
-                // 	url: 'intermediary/list'
-                // },
-                // {
-                // 	icon: 'icon_project_active',
-                // 	activeIcon:'icon_project_active',
-                // 	code: '5',
-                // 	txt: '项目申报管理',
-                // 	child: [
-                // 		{
-                // 			txt: '项目信息申报',
-                // 			code: '501',
-                // 			url: 'subject/subInfo/report'
-                // 		},
-                // 		/* {
-                //             txt: '项目申报',
-                //             code: '502',
-                //             url: 'subject/subPre/records_list'
-                //         }, */
-                // 		/* {
-                //             txt: '分配审核单位',
-                //             code: '502',
-                //             url: 'subject/subInfo/manage'
-                //         }, */
-                // 		{
-                // 			txt: '项目手续办理',
-                // 			code: '503',
-                // 			url: '/subPreNew/index'
-                // 		},
-                // 		{
-                // 			txt: '项目审核',
-                // 			code: '504',
-                // 			url: 'subject/apply/spList'/* ?type=qx */
-                // 		},
-                // 		/* {
-                //             txt: '项目审核-市发改委',
-                //             code: '505',
-                //             url: 'subject/apply/spList?type=sj'
-                //         }, */
-                // 		/* {
-                //             txt: '项目核准备案',
-                //             code: '505',
-                //             url: 'subject/hzba/list'
-                //         }, */
-                // 	]
-                // },
                 {
                     icon: 'icon_project_xtgl_active',
                     activeIcon: 'icon_project_xtgl_active',
                     code: '9',
                     txt: '系统管理',
                     child: [
-                        // {
-                        //     txt: '角色管理',
-                        //     code: '901',
-                        //     url: "Rolemeun/view"
-                        // },
-                        // {
-                        //     txt: '用户管理',
-                        //     code: '902',
-                        //     url: "user/view"
-                        // },
-                        // {
-                        //     txt: '用户管理-项目单位',
-                        //     code: '903',
-                        //     url: "userapply/view"
-                        // },
                         {
                             txt: '项目单位信息',
                             code: '904',
                             url: 'register/query'
                         },
-                        // {
-                        //     txt: '审核项目单位信息',
-                        //     code: '905',
-                        //     url: 'register/queryCheck'
-                        // },
                         {
                             txt: '行业部门信息',
                             code: '906',
                             url: 'junit/index'
                         },
-                        // {
-                        //     txt: '部门科室信息',
-                        //     code: '907',
-                        //     url: 'jdepart/index'
-                        // }
-                        // ,
-                        // {
-                        //     txt: '监管单位设置',
-                        //     code: '908',
-                        //     url: 'mainjunit/index'
-                        // },
                         {
                             txt: '字典管理',
                             code: '909',
@@ -500,16 +257,6 @@
                             code: '918',
                             url: 'subIndu/index',
                         },
-                        /* {
-                            txt: 'APP轮播图设置',
-                            code: '607',
-                            url: 'picture/index'
-                        }, */
-                        /* {
-                            txt: '项目文档的单位设置',
-                            code: '608',
-                            url: 'approvalUnit/index'
-                        }, */
                         {
                             txt: '公告管理',
                             code: '910',
@@ -520,16 +267,6 @@
                             code: '911',
                             url: 'sysTable/index'
                         },
-                        // {
-                        //     txt: '项目前期批复单位设置',
-                        //     code: '912',
-                        //     url: 'subPreFlow/setUnit'
-                        // },
-                        // {
-                        //     txt: '同步日志查询',
-                        //     code: '913',
-                        //     url: 'syncLog/index'
-                        // },
                         {
                             txt: '项目日志查询',
                             code: '913',
@@ -537,37 +274,14 @@
                         },
                         {
                             txt: '登录日志',
-                            code: '911',
+                            code: '920',
                             url: 'loginlog/index'
                         },
-                        // {
-                        //     code: '914',
-                        //     txt: '政策文件分类',
-                        //     url: 'policy/column/index'
-                        // },
-                        // {
-                        // 	code: '1002',
-                        // 	txt: '文件内容',
-                        // 	url: 'policy/document/index'
-                        // },
-                        // {
-                        // 	txt: '项目删除',
-                        // 	code: '515',
-                        // 	url: 'subject/subInfo/delView'
-                        // },
                         {
                             txt: '短信日志查询',
                             code: '915',
                             url: 'msgLog/index'
                         },
-                        // {
-                        <%--    txt: '项目总库',--%>
-                        <%--    code: '916',--%>
-                        <%--    url: 'subject/subInfo/projTz?type=5',--%>
-                        <%--    before: function () {--%>
-                        <%--        window.localStorage.removeItem("TzQueryParam_zk_${loginUserId}")--%>
-                        <%--    }--%>
-                        <%--},--%>
                         {
                             code: '917',
                             txt: 'A项目年度计划',
@@ -588,76 +302,12 @@
                         },
                         {
                             txt: 'D每个月项目转换情况',
-                            code: '407',
+                            code: '450',
                             url: 'tjfx/xmzhtj'
                             // url: 'register/underConstruction'
                         },
-                        <%--{--%>
-                        <%--    txt: '逾期项目',--%>
-                        <%--    code: '601',--%>
-                        <%--    url: 'overdue/view?overStatus=1'--%>
-                        <%--},--%>
-                        <%--{--%>
-                        <%--    code: '604',--%>
-                        <%--    txt: '重大事件记录专栏',--%>
-                        <%--    url: 'meetingRecords/list'--%>
-                        <%--},--%>
-                        <%--{--%>
-                        <%--    txt: '经纬度设置',--%>
-                        <%--    code: '704',--%>
-                        <%--    url: 'subject/subInfo/latitudeAndLongitude'--%>
-                        <%--},--%>
-                        <%--{--%>
-                        <%--    txt: '摄像头绑定',--%>
-                        <%--    code: '705',--%>
-                        <%--    url: 'camera/index'--%>
-                        <%--},--%>
                     ]
                 }
-                // ,{
-                // 	icon: 'icon_big_screen_active',
-                // 	activeIcon:'icon_big_screen_active',
-                // 	code: '8',
-                // 	txt: '统计分析',
-                // 	child: [
-                // 		/* {
-                //             code: '811',
-                //             txt: '项目预测分析',
-                //             url: 'prediction/index',
-                //         }, */{
-                // 			code: '812',
-                // 			txt: '同比',
-                // 			url: 'yoy/index'
-                //
-                // 		},{
-                // 			code: '813',
-                // 			txt: '环比',
-                // 			url: 'qoq/view'
-                // 		},{
-                // 			code: '814',
-                // 			txt: '年度投资分析',
-                // 			url: 'yoy/tjfx'
-                // 		}
-                // 	]
-                // }
-                // {
-                // 	icon: 'icon_big_screen_active',
-                // 	activeIcon:'icon_big_screen_active',
-                // 	txt: '政策文件管理',
-                // 	code: '10',
-                // 	child: [
-                // 		{
-                // 			code: '1001',
-                // 			txt: '政策文件分类',
-                // 			url: 'policy/column/index'
-                // 		},
-                // 		{
-                // 			code: '1002',
-                // 			txt: '文件内容',
-                // 			url: 'policy/document/index'
-                // 		}
-                // 	]
-                // }
             ],
             imgLs: 10
         },

+ 1 - 1
projects/src/main/webapp/vmodules/top.jsp

@@ -128,7 +128,7 @@
                 window.parent.postMessage({collapse: this.collapse}, "*");
             },
             changeSystem() {
-                App.postJson("/app/switch/toFgw", {}, function (res) {
+                App.postJson("api/app/switch/toFgw", {}, function (res) {
                     console.log(res);
                     if(res.code ===200){
                         var targetUrl = res.msg+"/index";