Browse Source

页面修改,挂接修改,用户同步修改

guoyuanquan@mail.taiji.com.cn 6 months ago
parent
commit
9421dfd5c2

+ 40 - 0
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/domain/TinfoClass.java

@@ -449,6 +449,14 @@ public class TinfoClass implements Serializable {
     private String grxxgm;//个人信息规模
     @Column(name = "sjjb")
     private String sjjb;//数据级别
+    @Column(name = "gjfwmc")
+    private String gjfwmc;//挂接服务名称
+    @Column(name = "gjfwdz")
+    private String gjfwdz;//挂接服务地址
+    @Column(name = "gjqqfs")
+    private String gjqqfs;//挂接请求方式
+    @Column(name = "gjsypt")
+    private String gjsypt;//挂接数源平台
 
     public Long getHitchSize() {
 		return hitchSize;
@@ -1322,4 +1330,36 @@ public class TinfoClass implements Serializable {
     public void setSjjb(String sjjb) {
         this.sjjb = sjjb;
     }
+
+    public String getGjfwmc() {
+        return gjfwmc;
+    }
+
+    public void setGjfwmc(String gjfwmc) {
+        this.gjfwmc = gjfwmc;
+    }
+
+    public String getGjfwdz() {
+        return gjfwdz;
+    }
+
+    public void setGjfwdz(String gjfwdz) {
+        this.gjfwdz = gjfwdz;
+    }
+
+    public String getGjqqfs() {
+        return gjqqfs;
+    }
+
+    public void setGjqqfs(String gjqqfs) {
+        this.gjqqfs = gjqqfs;
+    }
+
+    public String getGjsypt() {
+        return gjsypt;
+    }
+
+    public void setGjsypt(String gjsypt) {
+        this.gjsypt = gjsypt;
+    }
 }

+ 36 - 0
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/dto/TinfoClassDto.java

@@ -298,6 +298,10 @@ public class TinfoClassDto implements Serializable{
     private String sfbhgrxx;//是否包含个人信息
     private String grxxgm;//个人信息规模
     private String sjjb;//数据级别
+    private String gjfwmc;//挂接服务名称
+    private String gjfwdz;//挂接服务地址
+    private String gjqqfs;//挂接请求方式
+    private String gjsypt;//挂接数源平台
 
 
     public Integer getParentState() {
@@ -1190,4 +1194,36 @@ public class TinfoClassDto implements Serializable{
     public void setSjjb(String sjjb) {
         this.sjjb = sjjb;
     }
+
+    public String getGjfwmc() {
+        return gjfwmc;
+    }
+
+    public void setGjfwmc(String gjfwmc) {
+        this.gjfwmc = gjfwmc;
+    }
+
+    public String getGjfwdz() {
+        return gjfwdz;
+    }
+
+    public void setGjfwdz(String gjfwdz) {
+        this.gjfwdz = gjfwdz;
+    }
+
+    public String getGjqqfs() {
+        return gjqqfs;
+    }
+
+    public void setGjqqfs(String gjqqfs) {
+        this.gjqqfs = gjqqfs;
+    }
+
+    public String getGjsypt() {
+        return gjsypt;
+    }
+
+    public void setGjsypt(String gjsypt) {
+        this.gjsypt = gjsypt;
+    }
 }

+ 2 - 2
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/SsoSyncService.java

@@ -105,7 +105,7 @@ public class SsoSyncService {
                         userDto.setFlag(1);
                         userDto.setPassword("Taiji@2024#YJJ");
                         userDto.setState("1");
-                        userDto.setPhoneNum("13111111111");
+                        userDto.setPhoneNum(ssoUserDto.getMOBILE());
                         userDto.setDeptid(dept.getDeptId());
                         userDto.setPdeptids(dept.getPdeptids());
                         userDto.setPriority("0");
@@ -174,7 +174,7 @@ public class SsoSyncService {
 
     public static void main(String args[]){
         SsoSyncService ssoSyncService= new SsoSyncService();
-        ssoSyncService.syncDept();
+        ssoSyncService.syncUser();
     }
 
 

+ 5 - 0
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/TinfoClassHitchController.java

@@ -367,6 +367,10 @@ public class TinfoClassHitchController {
 	if (!"1".equals(checkinfo)) {
 		info.setDbid(dto.getDbid()); // 数据库信息
 		info.setHitch(dto.getHitch()); // 挂接情况说明
+		info.setGjfwdz(dto.getGjfwdz());
+		info.setGjfwmc(dto.getGjfwmc());
+		info.setGjqqfs(dto.getGjqqfs());
+		info.setGjsypt(dto.getGjsypt());
 	}
 	if("2".equals(info.getGjcheckstate())) {
 		info.setHitchStatus(1); // 挂接情况状态  1是已挂接   0未挂接
@@ -375,6 +379,7 @@ public class TinfoClassHitchController {
 		info.setHitchStatus(0);
 	}
 
+
 	tinfoClassService.saveTinfoClass(new TinfoClass(info));
 	if("1,2,3".contains(info.getGjcheckstate())) {
 		String result="审核通过";

+ 1 - 1
cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_zcshlist.js

@@ -54,7 +54,7 @@ layui.config({
           ,{title:'提交审核时间',width:300,templet:function(res){
         	  return res.vtaskDto.taskstart;
           } }
-          ,{field:'providebmname', title:'提供方部门'}
+          ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){
         		  return "有条件共享";

+ 6 - 6
cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_myyslist.html

@@ -41,13 +41,13 @@
               </select>
             </div>
           </div>
-          <div class="layui-inline">
-            <label class="layui-form-label">所处环节</label>
-            <div class="layui-input-inline">
-               <input type="text" name="actName" placeholder="请输入" autocomplete="off" class="layui-input"/>
+<!--          <div class="layui-inline">-->
+<!--            <label class="layui-form-label">所处环节</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--               <input type="text" name="actName" placeholder="请输入" autocomplete="off" class="layui-input"/>-->
 
-            </div>
-          </div>
+<!--            </div>-->
+<!--          </div>-->
           <div class="layui-inline">
             <label class="layui-form-label">数据资源管理单位</label>
             <div class="layui-input-inline">

+ 1 - 1
cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_resClassifyList.html

@@ -15,7 +15,7 @@
       <div class="layui-form layui-card-header layuiadmin-card-header-auto">
         <div class="layui-form-item" id="searchtable">
           <div class="layui-inline">
-            <label class="layui-form-label">信息类名称</label>
+            <label class="layui-form-label">数据资源名称</label>
             <div class="layui-input-inline">
               <input type="text" name="infoname" placeholder="请输入" autocomplete="off" class="layui-input"/>
             </div>

+ 16 - 0
cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfohitchclass/tinfoclass_onlyview.html

@@ -96,6 +96,22 @@
                        <td id="dbPwd">
                        </td>
                  </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务名称</th>
+                        <td th:text="${info.gjfwmc}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务地址</th>
+                        <td th:text="${info.gjfwdz}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>请求方式</th>
+                        <td th:text="${info.gjqqfs}"></td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>数源平台</th>
+                        <td th:text="${info.gjsypt}"></td>
+                    </tr>
                     <tr>
                         <th>挂接情况说明</th>
                        <td >

+ 29 - 0
cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfohitchclass/tinfoclass_view.html

@@ -117,6 +117,30 @@
                        <td id="dbPwd">
                        </td>
                  </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务名称</th>
+                        <td>
+                       		<input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjfwmc" th:value="${info.gjfwmc}" id="gjfwmc" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>服务地址</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjfwdz" th:value="${info.gjfwdz}" id="gjfwdz" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>请求方式</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjqqfs" th:value="${info.gjqqfs}" id="gjqqfs" />
+                        </td>
+                    </tr>
+                    <tr th:if="${info.sharemodetypename=='接口'}">
+                        <th><font class="fontred">*</font>数源平台</th>
+                        <td>
+                            <input type="text" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过200个字符" class="input-normal input-wdl"  name="gjsypt" th:value="${info.gjsypt}" id="gjsypt" />
+                        </td>
+                    </tr>
                     <tr>
                         <th><font class="fontred">*</font>挂接情况说明</th>
                        <td>
@@ -237,6 +261,11 @@
          if (checkinfo == "1") {
              $("#dbid").attr("disabled","disabled");
              $("#hitch").attr("disabled","disabled");
+             $("#gjfwdz").attr("disabled","disabled");
+             $("#gjfwmc").attr("disabled","disabled");
+             $("#gjqqfs").attr("disabled","disabled");
+             $("#gjsypt").attr("disabled","disabled");
+
          }
      });
  var changeDbId = function(options){