'1'

twzd-admin/src/main/java/com/miaxis/app/controller/lighting/LightingCombinationController.java

@@ -0,0 +1,56 @@
+package com.miaxis.app.controller.lighting;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.lighting.domain.LightingCombination;
+import com.miaxis.lighting.domain.LightingItem;
+import com.miaxis.lighting.service.ILightingCombinationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【灯光组合
+】Controller
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@RestController
+@RequestMapping("/lighting/combination")
+@Api(tags={"【H5-灯光模拟】"})
+public class LightingCombinationController extends BaseController{
+    @Autowired
+    private ILightingCombinationService lightingCombinationService;
+
+
+    /**
+     * 查询灯光组合列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询灯光组合列表")
+    public ResponsePageInfo<LightingCombination> list(){
+        List<LightingCombination> list = lightingCombinationService.selectLightingCombinationList(new LightingCombination());
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取灯光组合
+详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取灯光组合中的单项列表")
+    public Response<List<LightingItem>> getInfo(
+            @ApiParam(name = "id", value = "灯光组合参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(lightingCombinationService.getLightingItemsById(id));
+    }
+
+}

twzd-admin/src/main/java/com/miaxis/app/controller/lighting/LightingItemController.java

@@ -0,0 +1,38 @@
+package com.miaxis.app.controller.lighting;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.lighting.domain.LightingItem;
+import com.miaxis.lighting.service.ILightingItemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 【灯光单项】Controller
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@RestController
+@RequestMapping("/lighting/item")
+@Api(tags={"【H5-灯光模拟】"})
+public class LightingItemController extends BaseController{
+    @Autowired
+    private ILightingItemService lightingItemService;
+
+    /**
+     * 查询灯光单项列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询灯光单项列表")
+    public ResponsePageInfo<LightingItem> list(){
+        List<LightingItem> list = lightingItemService.selectLightingItemList(new LightingItem());
+        return toResponsePageInfo(list);
+    }
+}

twzd-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  */
@@ -84,7 +85,8 @@ class PcWxController extends BaseController {
     public ResponsePageInfo<WxSchoolOrder> schoolList(@ModelAttribute QuerySchoolOrderListDTO dto){
         startPage();
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        dto.setSchoolName(user.getUserId()==1l? dto.getSchoolName(): user.getNickName());
+        Set<String> permissions = SecurityUtils.getLoginUser().getPermissions();
+        dto.setSchoolName(user.getUserId()==1l||permissions.contains("schoolOrder:index:search")? dto.getSchoolName(): user.getNickName());
         List<WxSchoolOrder> list = wxOrderService.QuerySchoolOrderList(dto);
         ResponsePageInfo<WxSchoolOrder> pageData = toResponsePageInfo(list);
         Map mapData = new HashMap<>();

twzd-service/src/main/java/com/miaxis/lighting/domain/LightingCombination.java

@@ -0,0 +1,103 @@
+package com.miaxis.lighting.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+/**
+ * 灯光组合
+对象 lighting_combination
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@Data
+@TableName("lighting_combination")
+@ApiModel(value = "LightingCombination", description = "灯光组合对象 lighting_combination")
+public class LightingCombination extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @TableField("titile")
+    @ApiModelProperty(value = "标题")
+    private String titile;
+
+    /** 操作 */
+    @Excel(name = "操作")
+    @TableField("operation")
+    @ApiModelProperty(value = "操作")
+    private String operation;
+
+    /** 图标地址 */
+    @Excel(name = "图标地址")
+    @TableField("icon")
+    @ApiModelProperty(value = "图标地址")
+    private String icon;
+
+    /** 单项id，多个用逗号隔开 */
+    @Excel(name = "单项id，多个用逗号隔开")
+    @TableField("item_id")
+    @ApiModelProperty(value = "单项id，多个用逗号隔开")
+    private String itemId;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setTitile(String titile){
+        this.titile = titile;
+    }
+
+    public String getTitile(){
+        return titile;
+    }
+    public void setOperation(String operation){
+        this.operation = operation;
+    }
+
+    public String getOperation(){
+        return operation;
+    }
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+
+    public String getIcon(){
+        return icon;
+    }
+    public void setItemId(String itemId){
+        this.itemId = itemId;
+    }
+
+    public String getItemId(){
+        return itemId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("titile", getTitile())
+            .append("operation", getOperation())
+            .append("icon", getIcon())
+            .append("itemId", getItemId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

twzd-service/src/main/java/com/miaxis/lighting/domain/LightingItem.java

@@ -0,0 +1,118 @@
+package com.miaxis.lighting.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 灯光单项对象 lighting_item
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@Data
+@TableName("lighting_item")
+@ApiModel(value = "LightingItem", description = "灯光单项对象 lighting_item")
+public class LightingItem extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @TableField("title")
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    /** 操作 */
+    @Excel(name = "操作")
+    @TableField("operation")
+    @ApiModelProperty(value = "操作")
+    private String operation;
+
+    /** 图标地址 */
+    @Excel(name = "图标地址")
+    @TableField("icon")
+    @ApiModelProperty(value = "图标地址")
+    private String icon;
+
+    /** 声音地址 */
+    @Excel(name = "声音地址")
+    @TableField("voice")
+    @ApiModelProperty(value = "声音地址")
+    private String voice;
+
+    /** 过程: 1-开始 2-过程 3-结束 */
+    @Excel(name = "过程: 1-开始 2-过程 3-结束")
+    @TableField("process")
+    @ApiModelProperty(value = "过程: 1-开始 2-过程 3-结束")
+    private Integer process;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setTitle(String title){
+        this.title = title;
+    }
+
+    public String getTitle(){
+        return title;
+    }
+    public void setOperation(String operation){
+        this.operation = operation;
+    }
+
+    public String getOperation(){
+        return operation;
+    }
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+
+    public String getIcon(){
+        return icon;
+    }
+    public void setVoice(String voice){
+        this.voice = voice;
+    }
+
+    public String getVoice(){
+        return voice;
+    }
+    public void setProcess(Integer process){
+        this.process = process;
+    }
+
+    public Integer getProcess(){
+        return process;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("operation", getOperation())
+            .append("icon", getIcon())
+            .append("voice", getVoice())
+            .append("process", getProcess())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

twzd-service/src/main/java/com/miaxis/lighting/mapper/LightingCombinationMapper.java

@@ -0,0 +1,26 @@
+package com.miaxis.lighting.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.lighting.domain.LightingCombination;
+
+/**
+ * 灯光组合
+Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+public interface LightingCombinationMapper extends BaseMapper<LightingCombination> {
+    /**
+     * 查询灯光组合
+列表
+     *
+     * @param lightingCombination 灯光组合
+
+     * @return 灯光组合
+集合
+     */
+    public List<LightingCombination> selectLightingCombinationList(LightingCombination lightingCombination);
+
+}

twzd-service/src/main/java/com/miaxis/lighting/mapper/LightingItemMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.lighting.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.lighting.domain.LightingItem;
+
+/**
+ * 灯光单项Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+public interface LightingItemMapper extends BaseMapper<LightingItem> {
+    /**
+     * 查询灯光单项列表
+     *
+     * @param lightingItem 灯光单项
+     * @return 灯光单项集合
+     */
+    public List<LightingItem> selectLightingItemList(LightingItem lightingItem);
+
+}

twzd-service/src/main/java/com/miaxis/lighting/service/ILightingCombinationService.java

@@ -0,0 +1,29 @@
+package com.miaxis.lighting.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.lighting.domain.LightingCombination;
+import com.miaxis.lighting.domain.LightingItem;
+
+import java.util.List;
+
+/**
+ * 灯光组合
+Service接口
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+public interface ILightingCombinationService extends IService<LightingCombination>{
+    /**
+     * 查询灯光组合
+列表
+     *
+     * @param lightingCombination 灯光组合
+
+     * @return 灯光组合
+集合
+     */
+    public List<LightingCombination> selectLightingCombinationList(LightingCombination lightingCombination);
+
+    List<LightingItem> getLightingItemsById(Long id);
+}

twzd-service/src/main/java/com/miaxis/lighting/service/ILightingItemService.java

@@ -0,0 +1,21 @@
+package com.miaxis.lighting.service;
+
+import java.util.List;
+import com.miaxis.lighting.domain.LightingItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 灯光单项Service接口
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+public interface ILightingItemService extends IService<LightingItem>{
+    /**
+     * 查询灯光单项列表
+     *
+     * @param lightingItem 灯光单项
+     * @return 灯光单项集合
+     */
+    public List<LightingItem> selectLightingItemList(LightingItem lightingItem);
+}

twzd-service/src/main/java/com/miaxis/lighting/service/impl/LightingCombinationServiceImpl.java

@@ -0,0 +1,52 @@
+package com.miaxis.lighting.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.lighting.domain.LightingCombination;
+import com.miaxis.lighting.domain.LightingItem;
+import com.miaxis.lighting.mapper.LightingCombinationMapper;
+import com.miaxis.lighting.service.ILightingCombinationService;
+import com.miaxis.lighting.service.ILightingItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 灯光组合
+Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@Service
+public class LightingCombinationServiceImpl extends ServiceImpl<LightingCombinationMapper, LightingCombination> implements ILightingCombinationService {
+    @Autowired
+    private LightingCombinationMapper lightingCombinationMapper;
+
+
+    @Autowired
+    private ILightingItemService lightingItemService;
+
+    /**
+     * 查询灯光组合
+列表
+     *
+     * @param lightingCombination 灯光组合
+
+     * @return 灯光组合
+
+     */
+    @Override
+    public List<LightingCombination> selectLightingCombinationList(LightingCombination lightingCombination){
+        return lightingCombinationMapper.selectLightingCombinationList(lightingCombination);
+    }
+
+    @Override
+    public List<LightingItem> getLightingItemsById(Long id) {
+        LightingCombination lightingCombination = this.getById(id);
+        String itemId = lightingCombination.getItemId();
+        String[] itemArr = itemId.split(",");
+        return lightingItemService.listByIds(Arrays.asList(itemArr));
+    }
+}

twzd-service/src/main/java/com/miaxis/lighting/service/impl/LightingItemServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.lighting.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.lighting.mapper.LightingItemMapper;
+import com.miaxis.lighting.domain.LightingItem;
+import com.miaxis.lighting.service.ILightingItemService;
+
+/**
+ * 灯光单项Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-03-21
+ */
+@Service
+public class LightingItemServiceImpl extends ServiceImpl<LightingItemMapper, LightingItem> implements ILightingItemService {
+    @Autowired
+    private LightingItemMapper lightingItemMapper;
+
+    /**
+     * 查询灯光单项列表
+     *
+     * @param lightingItem 灯光单项
+     * @return 灯光单项
+     */
+    @Override
+    public List<LightingItem> selectLightingItemList(LightingItem lightingItem){
+        return lightingItemMapper.selectLightingItemList(lightingItem);
+    }
+}

twzd-service/src/main/resources/mapper/lighting/LightingCombinationMapper.xml

@@ -0,0 +1,31 @@
+<?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.miaxis.lighting.mapper.LightingCombinationMapper">
+
+    <resultMap type="LightingCombination" id="LightingCombinationResult">
+        <result property="id"    column="id"    />
+        <result property="titile"    column="titile"    />
+        <result property="operation"    column="operation"    />
+        <result property="icon"    column="icon"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLightingCombinationVo">
+        select * from lighting_combination
+    </sql>
+
+    <select id="selectLightingCombinationList" parameterType="LightingCombination" resultMap="LightingCombinationResult">
+        <include refid="selectLightingCombinationVo"/>
+        <where>
+            <if test="titile != null  and titile != ''"> and titile = #{titile}</if>
+            <if test="operation != null  and operation != ''"> and operation = #{operation}</if>
+            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
+            <if test="itemId != null  and itemId != ''"> and item_id = #{itemId}</if>
+        </where>
+    </select>
+
+</mapper>

twzd-service/src/main/resources/mapper/lighting/LightingItemMapper.xml

@@ -0,0 +1,33 @@
+<?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.miaxis.lighting.mapper.LightingItemMapper">
+
+    <resultMap type="LightingItem" id="LightingItemResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="operation"    column="operation"    />
+        <result property="icon"    column="icon"    />
+        <result property="voice"    column="voice"    />
+        <result property="process"    column="process"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLightingItemVo">
+        select * from lighting_item
+    </sql>
+
+    <select id="selectLightingItemList" parameterType="LightingItem" resultMap="LightingItemResult">
+        <include refid="selectLightingItemVo"/>
+        <where>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="operation != null  and operation != ''"> and operation = #{operation}</if>
+            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
+            <if test="voice != null  and voice != ''"> and voice = #{voice}</if>
+            <if test="process != null "> and process = #{process}</if>
+        </where>
+    </select>
+
+</mapper>