代码生成模板优化

slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -65,9 +65,10 @@ public class FrontController extends BaseController {
      * @param tXinyiChatRecord
      * @return
      */
-    @GetMapping("/bigmodel/qa/pageList")
+    @GetMapping("/bigModel/qa/pageList")
     public TableDataInfo qaPageList(TXinyiChatRecord tXinyiChatRecord)
     {
+        log.info("进入了 分页获取大模型的问答记录 接口");
         //获取登录用户信息
         Long userId = SecurityUtils.getUserId();
         tXinyiChatRecord.setUserId(String.valueOf(userId));
@@ -82,9 +83,10 @@ public class FrontController extends BaseController {
      * @param tXinyiChatRecord
      * @return
      */
-    @GetMapping("/bigmodel/qa/qaListBySessionId")
+    @GetMapping("/bigModel/qa/qaListBySessionId")
     public AjaxResult qaListBySessionId(TXinyiChatRecord tXinyiChatRecord)
     {
+        log.info("进入了 通过sessionId获取某个用户的问答列表 接口");
         String sessionId = tXinyiChatRecord.getSessionId();
         if(StringUtils.isBlank(sessionId))
             throw new ServiceException("必须传入sessionId");
@@ -100,7 +102,7 @@ public class FrontController extends BaseController {
      * 获取报警统计信息接口
      * @return
      */
-    @GetMapping("/bigmodel/warningCount")
+    @GetMapping("/bigModel/warningCount")
     public AjaxResult warningCount()
     {
         log.info("进入了获取报警统计信息接口");
@@ -108,6 +110,31 @@ public class FrontController extends BaseController {
     }
 
 
+    /**
+     * 首页报警记录（按时间倒叙  取十条）
+     * @return
+     */
+    @GetMapping("/bigModel/home/warningList")
+    public AjaxResult homeWarningList()
+    {
+        log.info("进入了 首页报警记录（按时间倒叙  取十条） 接口");
+        return AjaxResult.success(frontService.homeWarningList());
+    }
+
+
+
+
+    /**
+     * 获取 信义推荐问答列表
+     * @return
+     */
+    @GetMapping("/bigModel/home/recommendQAList/{type}")
+    public AjaxResult recommendQAList(Integer type)
+    {
+        log.info("进入了 获取 信义推荐问答列表  接口");
+        return AjaxResult.success(frontService.recommendQAList(type));
+    }
+
 
 
 

slibra-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
         </where>
-        and del_flag = 0
+        and del_flag = 0 order by id desc
     </select>
     
     <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">

slibra-system/src/main/java/com/slibra/business/domain/TXinyiAgentAssistant.java

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -11,6 +15,11 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-05-17
  */
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TXinyiAgentAssistant extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -45,95 +54,4 @@ public class TXinyiAgentAssistant extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCategory(String category) 
-    {
-        this.category = category;
-    }
-
-    public String getCategory() 
-    {
-        return category;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-    public void setBanner(String banner) 
-    {
-        this.banner = banner;
-    }
-
-    public String getBanner() 
-    {
-        return banner;
-    }
-    public void setSort(String sort) 
-    {
-        this.sort = sort;
-    }
-
-    public String getSort() 
-    {
-        return sort;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("category", getCategory())
-            .append("title", getTitle())
-            .append("content", getContent())
-            .append("banner", getBanner())
-            .append("sort", getSort())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/domain/TXinyiRecommendQa.java

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -11,6 +15,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-05-17
  */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TXinyiRecommendQa extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -20,7 +28,7 @@ public class TXinyiRecommendQa extends BaseEntity
 
     /** 类型(0专家问答 1水质报警  2生化报警 3预测预警 ) */
     @Excel(name = "类型(0专家问答 1水质报警  2生化报警 3预测预警 )")
-    private Long type;
+    private Integer type;
 
     /** 问题 */
     @Excel(name = "问题")
@@ -37,75 +45,4 @@ public class TXinyiRecommendQa extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-    public void setQuestion(String question) 
-    {
-        this.question = question;
-    }
-
-    public String getQuestion() 
-    {
-        return question;
-    }
-    public void setSort(String sort) 
-    {
-        this.sort = sort;
-    }
-
-    public String getSort() 
-    {
-        return sort;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("type", getType())
-            .append("question", getQuestion())
-            .append("sort", getSort())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/domain/TXinyiWarningRecord.java

@@ -3,6 +3,10 @@ package com.slibra.business.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -14,6 +18,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-05-17
  */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TXinyiWarningRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -86,185 +94,4 @@ public class TXinyiWarningRecord extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-    public void setCategory(String category) 
-    {
-        this.category = category;
-    }
-
-    public String getCategory() 
-    {
-        return category;
-    }
-    public void setTime(Date time) 
-    {
-        this.time = time;
-    }
-
-    public Date getTime() 
-    {
-        return time;
-    }
-    public void setReason(String reason) 
-    {
-        this.reason = reason;
-    }
-
-    public String getReason() 
-    {
-        return reason;
-    }
-    public void setWarningVal(BigDecimal warningVal) 
-    {
-        this.warningVal = warningVal;
-    }
-
-    public BigDecimal getWarningVal() 
-    {
-        return warningVal;
-    }
-    public void setDesignVal(BigDecimal designVal) 
-    {
-        this.designVal = designVal;
-    }
-
-    public BigDecimal getDesignVal() 
-    {
-        return designVal;
-    }
-    public void setForecastVal(BigDecimal forecastVal) 
-    {
-        this.forecastVal = forecastVal;
-    }
-
-    public BigDecimal getForecastVal() 
-    {
-        return forecastVal;
-    }
-    public void setLevel(String level) 
-    {
-        this.level = level;
-    }
-
-    public String getLevel() 
-    {
-        return level;
-    }
-    public void setStatus(Long status) 
-    {
-        this.status = status;
-    }
-
-    public Long getStatus() 
-    {
-        return status;
-    }
-    public void setIsEmergency(String isEmergency) 
-    {
-        this.isEmergency = isEmergency;
-    }
-
-    public String getIsEmergency() 
-    {
-        return isEmergency;
-    }
-    public void setOffTime(Date offTime) 
-    {
-        this.offTime = offTime;
-    }
-
-    public Date getOffTime() 
-    {
-        return offTime;
-    }
-    public void setOperator(String operator) 
-    {
-        this.operator = operator;
-    }
-
-    public String getOperator() 
-    {
-        return operator;
-    }
-    public void setReview(String review) 
-    {
-        this.review = review;
-    }
-
-    public String getReview() 
-    {
-        return review;
-    }
-    public void setUseRecommend(Long useRecommend) 
-    {
-        this.useRecommend = useRecommend;
-    }
-
-    public Long getUseRecommend() 
-    {
-        return useRecommend;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("type", getType())
-            .append("category", getCategory())
-            .append("time", getTime())
-            .append("reason", getReason())
-            .append("warningVal", getWarningVal())
-            .append("designVal", getDesignVal())
-            .append("forecastVal", getForecastVal())
-            .append("level", getLevel())
-            .append("status", getStatus())
-            .append("isEmergency", getIsEmergency())
-            .append("offTime", getOffTime())
-            .append("operator", getOperator())
-            .append("review", getReview())
-            .append("useRecommend", getUseRecommend())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiWarningRecordMapper.java

@@ -60,4 +60,6 @@ public interface TXinyiWarningRecordMapper
     public int deleteTXinyiWarningRecordByIds(Long[] ids);
 
     int getWarningCountByType(int type);
+
+    List<TXinyiWarningRecord> homeWarningList();
 }

slibra-system/src/main/java/com/slibra/business/service/IFrontService.java

@@ -1,6 +1,8 @@
 package com.slibra.business.service;
 
 import com.slibra.business.domain.TXinyiDaily;
+import com.slibra.business.domain.TXinyiRecommendQa;
+import com.slibra.business.domain.TXinyiWarningRecord;
 import com.slibra.business.res.XinyiIndustrySimple;
 
 import java.util.List;
@@ -17,4 +19,8 @@ public interface IFrontService
     XinyiIndustrySimple countInfo();
 
     List<String> warningCount();
+
+    List<TXinyiWarningRecord> homeWarningList();
+
+    List<TXinyiRecommendQa> recommendQAList(Integer type);
 }

slibra-system/src/main/java/com/slibra/business/service/impl/FrontServiceImpl.java

@@ -4,13 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
-import com.slibra.business.domain.TXinyiDaily;
-import com.slibra.business.domain.TXinyiIndustry;
-import com.slibra.business.domain.TXinyiNormConfig;
-import com.slibra.business.mapper.TXinyiDailyMapper;
-import com.slibra.business.mapper.TXinyiIndustryMapper;
-import com.slibra.business.mapper.TXinyiNormConfigMapper;
-import com.slibra.business.mapper.TXinyiWarningRecordMapper;
+import com.slibra.business.domain.*;
+import com.slibra.business.mapper.*;
 import com.slibra.business.res.XinyiIndustrySimple;
 import com.slibra.business.service.IFrontService;
 import com.slibra.common.utils.DateUtils;
@@ -47,6 +42,9 @@ public class FrontServiceImpl implements IFrontService {
     @Autowired
     private TXinyiWarningRecordMapper xinyiWarningRecordMapper;
 
+    @Autowired
+    private TXinyiRecommendQaMapper xinyiRecommendQaMapper;
+
     @Override
     public XinyiIndustrySimple countInfo() {
         //查询基本的工业库数据
@@ -79,6 +77,16 @@ public class FrontServiceImpl implements IFrontService {
         return result;
     }
 
+    @Override
+    public List<TXinyiWarningRecord> homeWarningList() {
+        return this.xinyiWarningRecordMapper.homeWarningList();
+    }
+
+    @Override
+    public List<TXinyiRecommendQa> recommendQAList(Integer type) {
+        return this.xinyiRecommendQaMapper.selectTXinyiRecommendQaList(TXinyiRecommendQa.builder().type(type).build());
+    }
+
     private XinyiIndustrySimple calculateData(XinyiIndustrySimple xinyiIndustrySimple, LocalDateTime nowTime) {
         LocalDateTime yesterdaySameTime = nowTime.plusDays(-1);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtils.YYYYMMDDHHMM_TS);

slibra-system/src/main/resources/mapper/business/TXinyiRecommendQaMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
-        and del_flag = 0
+        and del_flag = 0 order by id desc
     </select>
     
     <select id="selectTXinyiRecommendQaById" parameterType="Long" resultMap="TXinyiRecommendQaResult">

slibra-system/src/main/resources/mapper/business/TXinyiWarningRecordMapper.xml

@@ -170,4 +170,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND type != 2
         </if>
     </select>
+
+
+    <select id="homeWarningList" resultMap="TXinyiWarningRecordResult">
+        <include refid="selectTXinyiWarningRecordVo"/>
+        where del_flag = 0
+        AND type IN ( 0, 2 )
+        AND STATUS = 0
+        ORDER BY id DESC LIMIT 10
+    </select>
 </mapper>