组织优化

Api/src/main/java/com/java110/api/rest/GetPhotoByInst.java

@@ -65,6 +65,7 @@ public class GetPhotoByInst {
         String photoUrl = tmpPhotoPaths[1];
 
         downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,"qhdx_"+instId+"_17.jpg");
+        //downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,instId+".jpg");
     }
 
 

Api/src/main/java/com/java110/api/rest/PicTest.java

@@ -19,7 +19,7 @@ import javax.imageio.stream.FileImageOutputStream;
 public class PicTest {
     public static void main(String[] args) throws IOException {
         long timeStart = System.currentTimeMillis();
-        String imgLocalUrl = "E:\\tp\\abc.jpg";
+        String imgLocalUrl = "D:\\白静雪.jpg";
 
         byte[] imgBytes = getByteByPic(imgLocalUrl);
         byte[] resultImg = compressUnderSize(imgBytes,800 * 1024);
@@ -69,9 +69,7 @@ public class PicTest {
     /**
      * 按照 宽高 比例压缩
      *
-     * @param imgIs 待压缩图片输入流
      * @param scale 压缩刻度
-     * @param out 输出
      * @return 压缩后图片数据
      * @throws IOException 压缩图片过程中出错
      */

Api/src/main/resources/photoInfo.txt

@@ -126,4 +126,24 @@
 713043985364|http://135.192.50.148:7500/v1/crmappkey0001/T1lOVgB_dT1RXrhCrK
 713044103672|http://135.192.50.148:7500/v1/crmappkey0001/T1tZCgBgbX1RXrhCrK
 713043976633|http://135.192.50.148:7500/v1/crmappkey0001/T1LZ_gB_CX1RXrhCrK
-713043967833|http://135.192.50.148:7500/v1/crmappkey0001/T1vO_gBQZT1RXrhCrK
+713043967833|http://135.192.50.148:7500/v1/crmappkey0001/T1vO_gBQZT1RXrhCrK
+713039847348|http://135.192.50.148:7500/v1/crmappkey0001/T1cFdTBXDT1RXrhCrK
+713039851547|http://135.192.50.148:7500/v1/crmappkey0001/T1fVVgBCZ_1RXrhCrK
+713039890438|http://135.192.50.148:7500/v1/crmappkey0001/T14VAgBXEs1RXrhCrK
+713039912006|http://135.192.50.148:7500/v1/crmappkey0001/T1QRWTB4VT1RXrhCrK
+713040089296|http://135.192.50.148:7500/v1/crmappkey0001/T1mAJgB_AT1RXrhCrK
+713040102279|http://135.192.50.148:7500/v1/crmappkey0001/T16JJgByWv1RXrhCrK
+713040137708|http://135.192.50.148:7500/v1/crmappkey0001/T1.zLTBbAl1RXrhCrK
+713040156309|http://135.192.50.148:7500/v1/crmappkey0001/T1L6KgB7xQ1RXrhCrK
+713040379105|http://135.192.50.148:7500/v1/crmappkey0001/T15OVgBKE_1RXrhCrK
+713040451190|http://135.192.50.148:7500/v1/crmappkey0001/T1hUYgBQZy1RXrhCrK
+713040819173|http://135.192.50.148:7500/v1/crmappkey0001/T1..JgB5Wm1RXrhCrK
+713041043972|http://135.192.50.148:7500/v1/crmappkey0001/T19OZgByDy1RXrhCrK
+713041841075|http://135.192.50.148:7500/v1/crmappkey0001/T192AgBvDv1RXrhCrK
+713042515929|http://135.192.50.148:7500/v1/crmappkey0001/T17KEgBs_v1RXrhCrK
+713042795870|http://135.192.50.148:7500/v1/crmappkey0001/T1cCCgBbxX1RXrhCrK
+713043330749|http://135.192.50.148:7500/v1/crmappkey0001/T145bgB_dm1RXrhCrK
+713043370598|http://135.192.50.148:7500/v1/crmappkey0001/T1qoYgBjEQ1RXrhCrK
+713043423115|http://135.192.50.148:7500/v1/crmappkey0001/T1SVCgBmCC1RXrhCrK
+713043441424|http://135.192.50.148:7500/v1/crmappkey0001/T1wAKgB7KT1RXrhCrK
+753040212159|http://135.192.50.148:7500/v1/crmappkey0001/T1VNJTBsLL1RXrhCrK

WebService/src/main/java/com/java110/web/components/org/AddOrgComponent.java

@@ -2,6 +2,7 @@ package com.java110.web.components.org;
 
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.org.IAddOrgSMO;
+import com.java110.web.smo.org.IListParentOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -15,6 +16,9 @@ public class AddOrgComponent {
     @Autowired
     private IAddOrgSMO addOrgSMOImpl;
 
+    @Autowired
+    private IListParentOrgsSMO listParentOrgsSMOImpl;
+
     /**
      * 添加组织管理数据
      * @param pd 页面数据封装
@@ -24,6 +28,11 @@ public class AddOrgComponent {
         return addOrgSMOImpl.saveOrg(pd);
     }
 
+
+    public ResponseEntity<String> getParentOrg(IPageData pd){
+        return listParentOrgsSMOImpl.listParentOrgs(pd);
+    }
+
     public IAddOrgSMO getAddOrgSMOImpl() {
         return addOrgSMOImpl;
     }
@@ -31,4 +40,12 @@ public class AddOrgComponent {
     public void setAddOrgSMOImpl(IAddOrgSMO addOrgSMOImpl) {
         this.addOrgSMOImpl = addOrgSMOImpl;
     }
+
+    public IListParentOrgsSMO getListParentOrgsSMOImpl() {
+        return listParentOrgsSMOImpl;
+    }
+
+    public void setListParentOrgsSMOImpl(IListParentOrgsSMO listParentOrgsSMOImpl) {
+        this.listParentOrgsSMOImpl = listParentOrgsSMOImpl;
+    }
 }

WebService/src/main/resources/components/orgPackage/add-org/addOrg.html

@@ -7,18 +7,6 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼编号</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
-                            </div>-->
 
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">组织名称</label>
@@ -41,10 +29,8 @@
                                 <label class="col-sm-2 col-form-label">上级组织</label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addOrgInfo.parentOrgId">
-                                        <option selected disabled value="">必填，请选择上级ID</option>
-                                        <option value="1">公司级</option>
-                                        <option value="2">分公司级</option>
-                                        <option value="3">部门级</option>
+                                        <option selected disabled value="">必填，请选择上级组织</option>
+                                        <option v-for="parentOrg in addOrgInfo.parentOrg" :value="parentOrg.orgId">{{parentOrg.parentOrgName}}</option>
                                     </select></div>
                             </div>
                             <div class="form-group row">

WebService/src/main/resources/components/orgPackage/add-org/addOrg.js

@@ -12,9 +12,18 @@
                 orgLevel:'',
                 parentOrgId:'',
                 description:'',
+                parentOrg:[]
 
             }
         },
+        watch:{
+            "addOrgInfo.orgLevel":{//深度监听，可监听到对象、数组的变化
+                handler(val, oldVal){
+                   vc.component._addOrgListParentOrgInfo();
+                },
+                deep:true
+            }
+         },
          _initMethod:function(){
 
          },
@@ -127,11 +136,31 @@
             clearAddOrgInfo:function(){
                 vc.component.addOrgInfo = {
                                             orgName:'',
-orgLevel:'',
-parentOrgId:'',
-description:'',
-
-                                        };
+                                            orgLevel:'',
+                                            parentOrgId:'',
+                                            description:'',
+            };
+            },
+            _parentOrgInfo:function(){
+
+                var param = {
+                    params:{
+                        orgLevel:vc.component.addOrgInfo.orgLevel
+                    }
+                 };
+
+               //发送get请求
+               vc.http.get('addOrg',
+                            'getParentOrg',
+                             param,
+                             function(json,res){
+                                var _orgManageInfo=JSON.parse(json);
+                                vc.component.addOrgInfo.parentOrg = _orgManageInfo.orgs;
+
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
             }
         }
     });