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

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

@@ -48,7 +48,7 @@ public class InstitutionalInformationController {
 
     /**
      * 教育机构的的添加
-     * 参数：name 名称，address 地址，lng 经度 lat 纬度
+     * 参数：name 名称，address 地址，lng 经度 lat 纬度 city:城市
      *      phone 电话,
      * @return
      */
@@ -61,7 +61,7 @@ public class InstitutionalInformationController {
     }
     /**
      * 教育机构信息的修改
-     * 参数：id 机构信息id，name 名称，address 地址，lng 经度 lat 纬度, headIntroduction 头部简介
+     * 参数：id 机构信息id，name 名称，address 地址，lng 经度 lat 纬度, headIntroduction 标签 （多个用的逗号隔开）
      *      phone 电话,amTime 上午上课时间,pmTime 下午上课时间， （file 上传的文件）非必传（简介图片）
      *      classAdvantages 课程特色，briefIntroduction 机构简介说明,file 简介图片文件,chargingStandard 收费标准
      * @return

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

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-17
+ * @since 2019-10-22
  */
 public class InstitutionalInformation extends Model<InstitutionalInformation> {
 
@@ -101,7 +101,7 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
     private LocalDateTime indate;
 
     /**
-     * 头部图片处说明
+     * 标签
      */
     @TableField("head_introduction")
     private String headIntroduction;
@@ -118,6 +118,12 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
     @TableField("charging_standard")
     private String chargingStandard;
 
+    /**
+     * 城市
+     */
+    @TableField("city")
+    private String city;
+
 
     public Integer getId() {
         return id;
@@ -247,6 +253,14 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         this.chargingStandard = chargingStandard;
     }
 
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -271,6 +285,7 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         ", headIntroduction=" + headIntroduction +
         ", isDelete=" + isDelete +
         ", chargingStandard=" + chargingStandard +
+        ", city=" + city +
         "}";
     }
 }

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

@@ -70,7 +70,7 @@ public class BookPageServiceImpl extends ServiceImpl<BookPageMapper, BookPage> i
         for (int i = 0; i < fileHeaderList.size(); i++) {
             FileHeader fileHeader = fileHeaderList.get(i);
             bookPage.setFile(fileHeader.getFileName());
-            Integer pageNum = Integer.parseInt(fileHeader.getFileName().substring(0,fileHeader.getFileName().length()-4));
+            Integer pageNum = Integer.parseInt(fileHeader.getFileName().substring(0,fileHeader.getFileName().indexOf(".")));
             bookPage.setPageNum(pageNum);
             bookPageMapper.insert(bookPage);
             zipFile2.extractFile(fileHeader, folderPath);

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("user_appointment");
+        strategy.setInclude("institutional_information");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -20,11 +20,12 @@
         <result column="head_introduction" property="headIntroduction" />
         <result column="is_delete" property="isDelete" />
         <result column="charging_standard" property="chargingStandard" />
+        <result column="city" property="city" />
     </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, indate, head_introduction, is_delete, charging_standard
+        id, name, phone, address, sys_id, lng, lat, am_time, pm_time, brief_introduction_pic, brief_introduction, class_advantages, indate, head_introduction, is_delete, charging_standard, city
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -44,6 +45,7 @@
         <result column="indate" property="indate" />
         <result column="head_introduction" property="headIntroduction" />
         <result column="charging_standard" property="chargingStandard" />
+        <result column="city" property="city" />
         <collection property="pics" ofType="com.hssx.bms.entity.InstitutionalPic">
             <result column="pid" property="id" />
             <result column="information_id" property="informationId" />
@@ -56,7 +58,7 @@
     <!--培训机构账号登录后看到的详情-->
     <select id="selectDetail" resultMap="BaseResultMapVO">
         select
-          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,
+          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,ii.city,
           ii.brief_introduction, ii.class_advantages, ii.indate, ii.head_introduction,ip.id pid,ip.information_id,ip.indate ipindate,ip.pic_url
         from
           institutional_information ii
@@ -70,7 +72,7 @@
     <!--培训机构根据id看到的详情-->
     <select id="selectDetailById" resultMap="BaseResultMapVO">
         select
-          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,
+          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,ii.city,
           ii.brief_introduction, ii.class_advantages, ii.indate, ii.head_introduction,ip.id pid,ip.information_id,ip.indate ipindate,ip.pic_url
         from
           institutional_information ii
@@ -81,4 +83,5 @@
         where
           ii.id = #{id}
     </select>
+
 </mapper>