20181225客户现场修改问题

src/main/java/com/izouma/awesomeadmin/dao/MemberInfoMapper.xml

@@ -274,10 +274,10 @@
         </if>
         id desc
     </select>
-    <select id="queryAllMemberInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MemberInfo">
+    <select id="queryAllMemberInfo" parameterType="java.util.Map" resultMap="memberMap">
         select
         <include refid="Base_Column_List"/>
-        from member_info
+        , 3 as img_type from member_info
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">

src/main/java/com/izouma/awesomeadmin/dao/MenuInfoMapper.xml

@@ -257,7 +257,7 @@
             </trim>
             ,
         </if>
-        id desc
+        id
     </select>
     <select id="queryAllMenuInfo" parameterType="java.util.Map" resultMap="MenuIconMap">
         select
@@ -356,7 +356,7 @@
             ,
         </if>
 
-        id desc
+        id
     </select>
     <select id="queryMenuInfo" parameterType="java.util.Map" resultMap="MenuIconMap">
         select

src/main/java/com/izouma/awesomeadmin/dao/SubItemMapper.xml

@@ -138,7 +138,7 @@
     <select id="querySubItemByPage" parameterType="java.util.Map" resultMap="IconMap">
         select
         <include refid="Base_Column_List"/>
-        , 4 as img_type from sub_item
+        , 4 as img_type , 1 as sub_type from sub_item
         <where>
             and del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
@@ -230,7 +230,7 @@
     <select id="queryAllSubItem" parameterType="java.util.Map" resultMap="IconMap">
         select
         <include refid="Base_Column_List"/>
-        , 4 as img_type from sub_item
+        , 4 as img_type , 1 as sub_type from sub_item
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
@@ -321,7 +321,7 @@
     <select id="querySubItem" parameterType="java.util.Map" resultMap="IconMap">
         select
         <include refid="Base_Column_List"/>
-        , 4 as img_type from sub_item
+        , 4 as img_type , 1 as sub_type from sub_item
         <where>
             and del_flag = 'N'
             <if test="id != null and !&quot;&quot;.equals(id)">
@@ -378,6 +378,10 @@
                      select="com.izouma.awesomeadmin.dao.ImgInfoMapper.queryImgInfo"
                      column="{fatherId =  id ,type = img_type }">
         </association>
+        <collection property="images" ofType="com.izouma.awesomeadmin.model.ImgInfo"
+                     select="com.izouma.awesomeadmin.dao.ImgInfoMapper.queryAllImgInfo"
+                     column="{fatherId =  id ,type = sub_type }">
+        </collection>
     </resultMap>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/model/SubItem.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class SubItem{
+public class SubItem {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -20,19 +21,21 @@ public class SubItem{
     private String imgUrl;
     private Integer imgId;
 
-private String idStr;
+    private List<ImgInfo> images;
+
+    private String idStr;
 
-private String searchKey;
+    private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
     public Integer getImgId() {
         return imgId;
@@ -42,94 +45,101 @@ private String orderByStr;
         this.imgId = imgId;
     }
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getName(){
+
+    public String getName() {
         return this.name;
     }
 
-    public void setName(String name){
+    public void setName(String name) {
         this.name = name;
     }
-    public Integer getMenuInfoId(){
+
+    public Integer getMenuInfoId() {
         return this.menuInfoId;
     }
 
-    public void setMenuInfoId(Integer menuInfoId){
+    public void setMenuInfoId(Integer menuInfoId) {
         this.menuInfoId = menuInfoId;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
     public ImgInfo getIcon() {
         return icon;
@@ -149,5 +159,13 @@ public void setIdStr(String idStr) {
     public void setImgUrl(String imgUrl) {
         this.imgUrl = imgUrl;
     }
+
+    public List<ImgInfo> getImages() {
+        return images;
+    }
+
+    public void setImages(List<ImgInfo> images) {
+        this.images = images;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/MemberInfoController.java

@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/memberInfo")
 public class MemberInfoController {
@@ -42,8 +42,8 @@ public class MemberInfoController {
 
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -53,8 +53,8 @@ public class MemberInfoController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getMemberInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getMemberInfo(@RequestParam(required = false, value = "id") String id) {
@@ -63,8 +63,8 @@ public class MemberInfoController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(MemberInfo record) {
@@ -74,22 +74,21 @@ public class MemberInfoController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MemberInfo record) {
 
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
-        if(!"2".equals(userInfo.getDepartId()))
-        {
+        if (!"2".equals(userInfo.getDepartId())) {
             record.setStationId(Integer.parseInt(userInfo.getDepartId()));
         }
 
         Map<String, Object> result = new HashMap<>();
 
-        List<MemberInfo> pp =memberInfoService.getMemberInfoByPage(page, record);
+        List<MemberInfo> pp = memberInfoService.getMemberInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -98,16 +97,15 @@ public class MemberInfoController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MemberInfo record) {
 
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
-        if(!"2".equals(userInfo.getDepartId()))
-        {
+        if (!"2".equals(userInfo.getDepartId())) {
             record.setStationId(Integer.parseInt(userInfo.getDepartId()));
         }
 
@@ -117,7 +115,7 @@ public class MemberInfoController {
             OperateHistory oh = new OperateHistory();
             oh.setUsername(userInfo.getUsername());
             oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
-            oh.setContent("添加公示投教员工: id="+record.getId());
+            oh.setContent("添加公示投教员工: id=" + record.getId());
             operateHistoryService.createOperateHistory(oh);
 
             ImgInfo img = new ImgInfo();
@@ -126,14 +124,14 @@ public class MemberInfoController {
             img.setUrl(record.getImgUrl());
             imgInfoService.createImgInfo(img);
 
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMemberInfo(MemberInfo record) {
@@ -146,13 +144,30 @@ public class MemberInfoController {
             OperateHistory oh = new OperateHistory();
             oh.setUsername(userInfo.getUsername());
             oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
-            oh.setContent("更新公示投教员工: id="+record.getId());
+            oh.setContent("更新公示投教员工: id=" + record.getId());
             operateHistoryService.createOperateHistory(oh);
 
+            /**
+             * 20181225更新图片修改
+             */
             ImgInfo img = new ImgInfo();
-            img.setId(record.getImgId());
-            img.setUrl(record.getImgUrl());
-            imgInfoService.updateImgInfo(img);
+
+            img.setFatherId(record.getId());
+            img.setType(3);
+            img = imgInfoService.getImgInfo(img);
+            if (img != null) {
+                img.setUrl(record.getImgUrl());
+                img.setFatherId(record.getId());
+                img.setType(3);
+                imgInfoService.updateImgInfo(img);
+            } else {
+                img = new ImgInfo();
+                img.setFatherId(record.getId());
+                img.setType(3);
+                img.setUrl(record.getImgUrl());
+                imgInfoService.createImgInfo(img);
+            }
+
 
             return new Result(true, "保存成功");
         }
@@ -160,60 +175,61 @@ public class MemberInfoController {
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteMemberInfo(MemberInfo record) {
 
         boolean num = memberInfoService.deleteMemberInfo(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, MemberInfo record) throws Exception {
 
-    List<MemberInfo> memberInfos = memberInfoService.getMemberInfoList(record);
+        List<MemberInfo> memberInfos = memberInfoService.getMemberInfoList(record);
 
 
         String sheetName = "member_info";
         String titleName = "成员信息数据表";
         String fileName = "成员信息表";
         int columnNumber = 10;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "成员姓名" ,   "职位" ,   "证书编号" ,   "资格"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "成员姓名", "职位", "证书编号", "资格"};
         String[][] dataList = new String[memberInfos.size()][10];
 
         for (int i = 0; i < memberInfos.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(memberInfos.get(i).getId());
-                        dataList[i][1] = String.valueOf(memberInfos.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(memberInfos.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(memberInfos.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(memberInfos.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(memberInfos.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(memberInfos.get(i).getName());
-                        dataList[i][7] = String.valueOf(memberInfos.get(i).getPost());
-                        dataList[i][8] = String.valueOf(memberInfos.get(i).getCertificatenum());
-                        dataList[i][9] = String.valueOf(memberInfos.get(i).getQualification());
-                    }
+            dataList[i][0] = String.valueOf(memberInfos.get(i).getId());
+            dataList[i][1] = String.valueOf(memberInfos.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(memberInfos.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(memberInfos.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(memberInfos.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(memberInfos.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(memberInfos.get(i).getName());
+            dataList[i][7] = String.valueOf(memberInfos.get(i).getPost());
+            dataList[i][8] = String.valueOf(memberInfos.get(i).getCertificatenum());
+            dataList[i][9] = String.valueOf(memberInfos.get(i).getQualification());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}
 

src/main/resources/properties/outsidews.properties

@@ -11,7 +11,7 @@ rongyunappkey=x18ywvqfxbmic
 rongyunappsecret=MnM3kGXf7a
 jwtsecret=3MgWy/pJjxHCQW2pHlQbkjomTUPRo9WhsPFjUPYZZlo=
 host=http://1eaed69e.ngrok.io
-base_domain=http://192.168.1.5:8080
+base_domain=http://localhost:8080
 ALIPAY_APP_ID=2016101100660827
 ALIPAY_APP_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNbcuW0ij0mOezs+mRAYoyXlN5jZzr8WaO4q1kXTy7Xu9+C3+vurYgrqb9j+IeVsph4rhyF9P98H0cFQABnumiV6jaY3/wke/9aj8uBV5zvHC3GrkSDUQotPAmE+blwqFdofQsaoOuHOR1FfstLg29jOaVipoNvkSGmOJqfIjAGaMEQy7p2S2jLIqyKGMj71TvoITAMCkkwbim0kmbN4reh5XPKTeT2upOa+64FNnYK3mJ141e2LNWNx2HAIhaw88+KUiHNXUS3LA+aGw0inZP3UdSPAetsEagNeD+NXNtWf7DeABn/0K8SGgUkScODeC8TesOpS5lcmVj5W5w9hK7AgMBAAECggEBAIzxG5Fqtza6AZ5FfaZDTDGqjdMD2fn3Mcous4/8eEKFrALqmLxUeciKi3/ES/tMyKXIC4wb1RKRAQVXUx3JjboYMn1Dbu/68JEJaDeG73qwexTlfLxp5a2YFnvJg813b4byKriei6HVqNi8MAybYEoAdeN7qJ5tQE6obg9pSdmhgg6tnza51ASlwepZqxQ2YDMvROg7KA2PHlIrdVhLBy0GGG3YvSxsl2jOmXst96mihYa6vD4rXZjVXnd+kwS+x5Mpw7tLdEkS+PSrFRFpW6W0LwnGcJm1lC3L5X8wQ+lXGT3X2TrZV4j+NCwTyn3WFr3yGRnLAzJD5vMJI/sTY8ECgYEA8o1+9ZW7XIvO+zIBEsq177pEYlqFoW2e8acokeYPXex6RmIhaikQVegnwSQcu8hvD2Gh0ozGEH1Y47vCvGi6Q9pswy4pT47BQyuir/8EVSPsO+2atWa/YXot0Gcmm2GSWXT/DNJViaGB+oT4m15mCDtzVeJIndytglx0TF9saFMCgYEA2NFob1K+fi4+NZD8WrkAnjPKodeOsu+YxNnB3E53xd8BgVLVgC9F/eEwDkbWazil5Wykwf07OGbBK5+rUv9w2DHJMHyaGQ5HpCRx06P2gxquFdudXjWwV+6TseEQDloyE13oKT8+oJBedYTNI3D6mjGv+ni+gksaU74WS0mtvvkCgYEAx5SSUTXBk6ceyyccJwBRsE6Oknd12Zy/2ov3IAYzws8g1eVNJXNgk6+RdqVmV0XXzMpDQ2K+Xzck+062MB3kloyWTgwfxezrLYAsP7EROZVzfuRGFtnSxDyqkf8uj1A8Agv5Ce3QoI0azK65ee60+jUg9BxcMDkzND8rGuSx6S0CgYAu2JAH/YjLGpK2YC0mLPLFO8t8TGa4oqwPXD1WrF2UkypwFsWqfIxS3mTTsNqDMCon9+FhSKWS+iCinE0YEbj//UHLCCEDaOJxxK4TXEnW6dzTPDA0OsVvOk0PEeG2OCa5qICQ6OlPJ+JA4gCwt6htyG6NX6lJ3ZBCp7+JZNH1gQKBgCbsC8LzVOLIw6GR87X0oeWTfq7KKVD6rMfG58jHpTSAdY6ge9f2CyxKhfUyemZtu7BsRCFeuI5NDmtmg5uXS6Nu1dL/R5Xs33mB64fwYX/kXErnrHYrCekC1uIM8I/hTyVfbUvoMArq+3s2W7KTmq63ygBEnNOAqomJDHeW+/wv
 ALIPAY_CHARSET=utf-8