feats

src/main/java/com/huiju/estateagents/controller/TaMiniappThemeController.java

@@ -0,0 +1,50 @@
+package com.huiju.estateagents.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+import com.huiju.estateagents.service.ITaMiniappThemeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/api")
+public class TaMiniappThemeController extends BaseController {
+
+    @Autowired
+    ITaMiniappThemeService iTaMiniappThemeService;
+
+    @GetMapping("/admin/miniapp-theme")
+    public ResponseBean getThemeListForAdmin(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        Boolean includeNotUsed = true;
+        IPage<TaMiniappTheme> themeList = iTaMiniappThemeService.getThemeList(orgId, includeNotUsed, pageNum, pageSize);
+
+        return ResponseBean.success(themeList);
+    }
+
+    @PostMapping("/admin/miniapp-theme")
+    public ResponseBean saveTheme(@RequestBody TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        if (taMiniappTheme == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        taMiniappTheme.setOrgId(orgId);
+
+        Boolean success = iTaMiniappThemeService.save(taMiniappTheme);
+        if (success) {
+            return ResponseBean.success(taMiniappTheme);
+        } else {
+            return ResponseBean.error("保存主题失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/entity/TaMiniappOrgIcon.java

@@ -70,5 +70,5 @@ public class TaMiniappOrgIcon implements Serializable {
      */
     private LocalDateTime updateDate;
 
-
+    private Integer themeId;
 }

src/main/java/com/huiju/estateagents/entity/TaMiniappTheme.java

@@ -0,0 +1,100 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 小程序主题设置
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniappTheme implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主题ID
+     */
+    @TableId(value = "theme_id", type = IdType.AUTO)
+    private Integer themeId;
+
+    /**
+     * 主题名称
+     */
+    private String themeTitle;
+
+    /**
+     * 启用时间 格式MM-DDTHH24:MI
+     */
+    private String startTime;
+
+    /**
+     * 停用时间 格式MM-DDTHH24:MI
+     */
+    private String endTime;
+
+    /**
+     * 导航前景颜色
+     */
+    private String naviFrontColor;
+
+    /**
+     * 导航背景颜色
+     */
+    private String naviBackColor;
+
+    /**
+     * TabBar前景颜色
+     */
+    private String tabbarFrontColor;
+
+    /**
+     * TabBar背景颜色
+     */
+    private String tabbarBackColor;
+
+    /**
+     * TabBar选择色
+     */
+    private String tabbarSelectColor;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 修改人
+     */
+    private Integer modifyUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifyDate;
+
+    /**
+     * 导航图标列表
+     */
+    @TableField(exist = false)
+    private List<TaMiniappOrgIcon> iconList;
+}

src/main/java/com/huiju/estateagents/mapper/TaMiniappIconMapper.java

@@ -2,7 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniappIcon;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMiniappIconMapper extends BaseMapper<TaMiniappIcon> {
 
+    List<TaMiniappOrgIcon> getListByTheme(@Param("themeId") Integer themeId);
 }

src/main/java/com/huiju/estateagents/mapper/TaMiniappThemeMapper.java

@@ -0,0 +1,9 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaMiniappThemeMapper extends BaseMapper<TaMiniappTheme> {
+}

src/main/java/com/huiju/estateagents/service/ITaMiniappThemeService.java

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+
+public interface ITaMiniappThemeService extends IService<TaMiniappTheme> {
+
+    IPage<TaMiniappTheme> getThemeList(Integer orgId, Boolean includeNotUsed, Integer pageNum, Integer pageSize);
+}

src/main/java/com/huiju/estateagents/service/impl/TaMiniappThemeServiceImpl.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniappTheme;
+import com.huiju.estateagents.mapper.TaMiniappIconMapper;
+import com.huiju.estateagents.mapper.TaMiniappThemeMapper;
+import com.huiju.estateagents.service.ITaMiniappThemeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class TaMiniappThemeServiceImpl extends ServiceImpl<TaMiniappThemeMapper, TaMiniappTheme> implements ITaMiniappThemeService {
+    @Autowired
+    TaMiniappThemeMapper taMiniappThemeMapper;
+
+    @Autowired
+    TaMiniappIconMapper taMiniappIconMapper;
+
+    @Override
+    public IPage<TaMiniappTheme> getThemeList(Integer orgId, Boolean includeNotUsed, Integer pageNum, Integer pageSize) {
+        QueryWrapper<TaMiniappTheme> queryTheme = new QueryWrapper<>();
+        queryTheme.eq("org_id", orgId);
+
+        if (includeNotUsed) {
+            queryTheme.gt("status", CommConstant.STATUS_DELETE);
+        } else {
+            queryTheme.eq("status", CommConstant.STATUS_NORMAL);
+        }
+
+        IPage<TaMiniappTheme> result = this.page(new Page<>(pageNum, pageSize), queryTheme);
+        if (result.getSize() > 0) {
+            for (TaMiniappTheme theme: result.getRecords()) {
+                theme.setIconList(taMiniappIconMapper.getListByTheme(theme.getThemeId()));
+            }
+        }
+
+        return result;
+    }
+}

src/main/resources/mapper/TaMiniappIconMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaMiniappIconMapper">
 
+    <select id="getListByTheme" resultType="com.huiju.estateagents.entity.TaMiniappOrgIcon">
+        SELECT
+            *
+        FROM
+            ta_miniapp_org_icon t
+        WHERE
+            t.theme_id = #{themeId}
+            AND t.`status` = 1
+        ORDER BY
+            t.sort DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaMiniappTheme.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.entity.TaMiniappTheme">
+
+</mapper>