Merge branch 'master' of http://47.100.37.243:10080/wutt/childrenLibraryBMS

bms/src/main/java/com/hssx/bms/controller/InstitutionalInformationController.java

@@ -126,6 +126,19 @@ public class InstitutionalInformationController {
         return msg;
     }
 
+    /**
+     * 教育机构信息的删除
+     * 参数：id 机构id
+     * @return
+     */
+    @ApiOperation(value = "教育机构信息删除", notes = "教育机构信息删除方法")
+    @RequestMapping("/delete")
+    @ResponseBody
+    public HttpRespMsg delete(InstitutionalInformation information){
+        HttpRespMsg msg = institutionalService.deleteById(information);
+        return msg;
+    }
+
 
 
 }

bms/src/main/java/com/hssx/bms/controller/InstitutionalPicController.java

@@ -1,22 +0,0 @@
-package com.hssx.bms.controller;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-15
- */
-@Controller
-@RequestMapping("/institutionalpic")
-public class InstitutionalPicController {
-
-}
-

bms/src/main/java/com/hssx/bms/entity/InstitutionalInformation.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -13,7 +15,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-15
+ * @since 2019-10-17
  */
 public class InstitutionalInformation extends Model<InstitutionalInformation> {
 
@@ -95,6 +97,7 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
      * 时间
      */
     @TableField("indat")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indat;
 
     /**
@@ -103,6 +106,12 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
     @TableField("head_introduction")
     private String headIntroduction;
 
+    /**
+     * 是否删除 0-未删除 1-已删除
+     */
+    @TableField("is_delete")
+    private Integer isDelete;
+
 
     public Integer getId() {
         return id;
@@ -216,6 +225,14 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         this.headIntroduction = headIntroduction;
     }
 
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -238,6 +255,7 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         ", classAdvantages=" + classAdvantages +
         ", indat=" + indat +
         ", headIntroduction=" + headIntroduction +
+        ", isDelete=" + isDelete +
         "}";
     }
 }

bms/src/main/java/com/hssx/bms/entity/InstitutionalPic.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -41,6 +43,7 @@ public class InstitutionalPic extends Model<InstitutionalPic> {
      * 上传时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

bms/src/main/java/com/hssx/bms/entity/vo/InstitutionalInformationVO.java

@@ -1,10 +1,7 @@
 package com.hssx.bms.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.hssx.bms.entity.InstitutionalInformation;
 import com.hssx.bms.entity.InstitutionalPic;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 

bms/src/main/java/com/hssx/bms/service/InstitutionalInformationService.java

@@ -27,4 +27,6 @@ public interface InstitutionalInformationService extends IService<InstitutionalI
     HttpRespMsg getInstitutionDetail(InstitutionalInformation information);
 
     HttpRespMsg addAccount(SystemUser systemUser);
+
+    HttpRespMsg deleteById(InstitutionalInformation information);
 }

bms/src/main/java/com/hssx/bms/service/impl/InstitutionalInformationServiceImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.bms.entity.InstitutionalInformation;
+import com.hssx.bms.entity.InstitutionalPic;
 import com.hssx.bms.entity.SystemUser;
 import com.hssx.bms.entity.vo.InstitutionalInformationVO;
 import com.hssx.bms.mapper.InstitutionalInformationMapper;
+import com.hssx.bms.mapper.InstitutionalPicMapper;
 import com.hssx.bms.mapper.SystemUserMapper;
 import com.hssx.bms.service.InstitutionalInformationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -40,6 +42,8 @@ public class InstitutionalInformationServiceImpl extends ServiceImpl<Institution
     private InstitutionalInformationMapper institutionalMapper;
     @Resource
     private SystemUserMapper systemUserMapper;
+    @Resource
+    private InstitutionalPicMapper picMapper;
     @Value("${upload.path}")
     private String path;
     @Override
@@ -98,7 +102,7 @@ public class InstitutionalInformationServiceImpl extends ServiceImpl<Institution
             page = new PageUtil();
         }
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        List<InstitutionalInformation> institutionalInformations = institutionalMapper.selectList(new QueryWrapper<InstitutionalInformation>().select("id", "name", "phone", "address"));
+        List<InstitutionalInformation> institutionalInformations = institutionalMapper.selectList(new QueryWrapper<InstitutionalInformation>().eq("is_delete",0).select("id", "name", "phone", "address"));
         PageInfo<InstitutionalInformation> pageInfo = new PageInfo<>(institutionalInformations);
         msg.data = pageInfo;
         return msg;
@@ -131,4 +135,20 @@ public class InstitutionalInformationServiceImpl extends ServiceImpl<Institution
         return msg;
     }
 
+    @Override
+    public HttpRespMsg deleteById(InstitutionalInformation information) {
+        HttpRespMsg msg = new HttpRespMsg();
+        //软删除
+        information.setIsDelete(1);
+        institutionalMapper.updateById(information);
+        //删除上传的自介绍图片
+        picMapper.delete(new QueryWrapper<InstitutionalPic>().eq("information_id",information.getId()));
+        InstitutionalInformation oldinformation = institutionalMapper.selectById(information.getId());
+        if(null != oldinformation.getSysId()){
+            //删除机构账号
+            systemUserMapper.delete(new QueryWrapper<SystemUser>().eq("id",oldinformation.getSysId()));
+        }
+        return msg;
+    }
+
 }

bms/src/main/java/com/hssx/bms/until/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("book_page");
+        strategy.setInclude("institutional_information");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

bms/src/main/resources/mapper/InstitutionalInformationMapper.xml

@@ -18,7 +18,13 @@
         <result column="class_advantages" property="classAdvantages" />
         <result column="indat" property="indat" />
         <result column="head_introduction" property="headIntroduction" />
+        <result column="is_delete" property="isDelete" />
     </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, phone, address, sys_id, lng, lat, am_time, pm_time, brief_introduction_pic, brief_introduction, class_advantages, indat, head_introduction
+    </sql>
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapVO" type="com.hssx.bms.entity.vo.InstitutionalInformationVO">
         <id column="id" property="id" />
@@ -44,10 +50,6 @@
         </collection>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, phone, address, sys_id, lng, lat, am_time, pm_time, brief_introduction_pic, brief_introduction, class_advantages, indat, head_introduction
-    </sql>
     <!--培训机构账号登录后看到的详情-->
     <select id="selectDetail" resultMap="BaseResultMapVO">
         select