首页

cirs-admin/src/main/java/com/cirs/web/controller/system/SysIndexController.java

@@ -16,7 +16,7 @@ public class SysIndexController
 {
     /** 系统基础配置 */
     @Autowired
-    private CirsConfig ruoyiConfig;
+    private CirsConfig cirsConfig;
 
     /**
      * 访问首页，提示语
@@ -24,6 +24,6 @@ public class SysIndexController
     @RequestMapping("/")
     public String index()
     {
-        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", cirsConfig.getName(), cirsConfig.getVersion());
     }
 }

cirs-admin/src/main/java/com/cirs/web/core/config/SwaggerConfig.java

@@ -32,7 +32,7 @@ public class SwaggerConfig
 {
     /** 系统基础配置 */
     @Autowired
-    private CirsConfig ruoyiConfig;
+    private CirsConfig cirsConfig;
 
     /** 是否开启swagger */
     @Value("${swagger.enabled}")
@@ -117,9 +117,9 @@ public class SwaggerConfig
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                .contact(new Contact(cirsConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
+                .version("版本号:" + cirsConfig.getVersion())
                 .build();
     }
 }

cirs-admin/src/main/resources/application-druid.yml

@@ -47,7 +47,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: cirs
                 login-password: 123456
             filter:
                 stat:

cirs-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 cirs:
   # 名称
-  name: RuoYi
+  name: cirs
   # 版本
   version: 1.0.0
   # 版权年份

cirs-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/cirs/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

cirs-biz/src/main/java/com/cirs/biz/controller/TEvaluationController.java

@@ -2,6 +2,9 @@ package com.cirs.biz.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.cirs.biz.domain.avgEvaluation;
+import com.cirs.common.core.redis.RedisCache;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +37,9 @@ public class TEvaluationController extends BaseController
     @Autowired
     private ITEvaluationService tEvaluationService;
 
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询评价列表
      */
@@ -77,6 +83,7 @@ public class TEvaluationController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TEvaluation tEvaluation)
     {
+//        redisCache.deleteObject("top10_components");
         return toAjax(tEvaluationService.insertTEvaluation(tEvaluation));
     }
 
@@ -88,6 +95,7 @@ public class TEvaluationController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TEvaluation tEvaluation)
     {
+//        redisCache.deleteObject("top10_components");
         return toAjax(tEvaluationService.updateTEvaluation(tEvaluation));
     }
 
@@ -99,15 +107,33 @@ public class TEvaluationController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+//        redisCache.deleteObject("top10_components");
         return toAjax(tEvaluationService.deleteTEvaluationByIds(ids));
     }
     //拿到对元器件的平均评价
     @PreAuthorize("@ss.hasPermi('biz:evaluation:getmark')")
 
     @GetMapping("/componentid/{componentid}")
-    public AjaxResult remove(@PathVariable String componentid)
+    public AjaxResult getscore(@PathVariable String componentid)
     {
+
         return success(tEvaluationService.getscore(componentid));
     }
 
+    @PreAuthorize("@ss.hasPermi('biz:evaluation:get_top10')")
+    @GetMapping("/get_top10")
+    public AjaxResult get_top10(){
+        List<avgEvaluation> avgEvaluations =  redisCache.getCacheList("top10_components");
+        System.out.println(avgEvaluations);
+        if (avgEvaluations==null||avgEvaluations.size()==0) {
+            List<avgEvaluation> avgs = tEvaluationService.get_top10();
+            redisCache.setCacheList("top10_components",avgs);
+            return success(avgs);
+        } else {
+            return success(avgEvaluations);
+        }
+
+    }
+
+
 }

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -108,7 +108,12 @@ public class TVerificationTaskDetailController extends BaseController
         ExcelUtil<TVerificationTaskDetail> util = new ExcelUtil<TVerificationTaskDetail>(TVerificationTaskDetail.class);
         List<TVerificationTaskDetail> taskDetailList = util.importExcel(file.getInputStream());
         String operName = getUsername();
-        String message = tVerificationTaskDetailService.importTaskDetail(taskDetailList, updateSupport, operName);
+        String fileName = file.getOriginalFilename();
+
+        assert fileName != null;
+        fileName =  fileName.substring(0, fileName.lastIndexOf("."));
+
+        String message = tVerificationTaskDetailService.importTaskDetail(taskDetailList, updateSupport, operName,fileName);
         return success(message);
     }
 

cirs-biz/src/main/java/com/cirs/biz/domain/TEvaluation.java

@@ -31,9 +31,20 @@ public class TEvaluation extends BaseEntity
     private Integer mark;
 
     /** 使用场景 */
-    @Excel(name = "使用场景")
+    @Excel(name = "应用设备")
     private String usedBy;
 
+    @Excel(name = "使用场景")
+    private String useScene;
+
+    public void setUseScene(String useScene){
+        this.useScene = useScene;
+    }
+
+    public String getUseScene(){
+        return this.useScene;
+    }
+
     public void setId(Long id) 
     {
         this.id = id;

cirs-biz/src/main/java/com/cirs/biz/domain/TPageViewTime.java

@@ -28,8 +28,20 @@ public class TPageViewTime extends BaseEntity
 
     /** 使用场景 */
     @Excel(name = "使用场景")
-    private String usedBy;
+    private String useScene;
 
+    @Excel(name = "查询条件")
+    private String searchCondition;
+
+    public void setSearchCondition(String searchCondition)
+    {
+        this.searchCondition = searchCondition;
+    }
+
+    public String getSearchCondition()
+    {
+        return searchCondition;
+    }
     public void setId(Long id) 
     {
         this.id = id;
@@ -57,14 +69,14 @@ public class TPageViewTime extends BaseEntity
     {
         return viewTime;
     }
-    public void setUsedBy(String usedBy) 
+    public void setUseScene(String useScene)
     {
-        this.usedBy = usedBy;
+        this.useScene = useScene;
     }
 
-    public String getUsedBy() 
+    public String getUseScene()
     {
-        return usedBy;
+        return useScene;
     }
 
     @Override
@@ -73,12 +85,12 @@ public class TPageViewTime extends BaseEntity
             .append("id", getId())
             .append("componentId", getComponentId())
             .append("viewTime", getViewTime())
-            .append("usedBy", getUsedBy())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("useScene",getUseScene())
             .toString();
     }
 }

cirs-biz/src/main/java/com/cirs/biz/domain/TVerificationTaskDetail.java

@@ -60,6 +60,11 @@ public class TVerificationTaskDetail extends BaseEntity
     @Excel(name = "计算结果3")
     private String calculate3;
 
+    @Excel(name = "计算结果4")
+    private String calculate4;
+
+    @Excel(name = "计算结果5")
+    private String calculate5;
     /** 召回率 */
 //    @Excel(name = "召回率")
 //    private String accuracy;
@@ -163,7 +168,7 @@ public class TVerificationTaskDetail extends BaseEntity
     {
         return calculate2;
     }
-    public void setCalculate3(String calculate3) 
+    public void setCalculate3(String calculate3)
     {
         this.calculate3 = calculate3;
     }
@@ -172,6 +177,24 @@ public class TVerificationTaskDetail extends BaseEntity
     {
         return calculate3;
     }
+    public void setCalculate4(String calculate4)
+    {
+        this.calculate4 = calculate4;
+    }
+
+    public String getCalculate4()
+    {
+        return calculate4;
+    }
+    public void setCalculate5(String calculate5)
+    {
+        this.calculate5 = calculate5;
+    }
+
+    public String getCalculate5()
+    {
+        return calculate5;
+    }
 //    public void setAccuracy(String accuracy)
 //    {
 //        this.accuracy = accuracy;
@@ -197,12 +220,15 @@ public class TVerificationTaskDetail extends BaseEntity
             .append("calculate1", getCalculate1())
             .append("calculate2", getCalculate2())
             .append("calculate3", getCalculate3())
+            .append("calculate2", getCalculate4())
+            .append("calculate3", getCalculate5())
 //            .append("accuracy", getAccuracy())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+
             .toString();
     }
 }

cirs-biz/src/main/java/com/cirs/biz/domain/UseInfofromRecord.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 public class UseInfofromRecord {
-    @Excel(name = "使用场景")
+    @Excel(name = "应用设备")
     private String usedBy;
 
     /** 使用日期 */

cirs-biz/src/main/java/com/cirs/biz/domain/avgEvaluation.java

@@ -0,0 +1,43 @@
+package com.cirs.biz.domain;
+
+import com.cirs.common.annotation.Excel;
+
+public class avgEvaluation {
+    @Excel(name = "元器件编号")
+    private String componentId;
+
+    @Excel(name = "元器件名称")
+    private String componentName;
+    /** 评分 */
+    @Excel(name = "平均评分")
+    private Float score;
+
+    public void setComponentId(String componentId)
+    {
+        this.componentId = componentId;
+    }
+
+    public String getComponentId()
+    {
+        return componentId;
+    }
+    public void setScore(Float score)
+    {
+        this.score = score;
+    }
+
+    public Float getScore()
+    {
+        return score;
+    }
+
+    public void setComponentName(String componentName)
+    {
+        this.componentName = componentName;
+    }
+
+    public String getComponentName()
+    {
+        return componentName;
+    }
+}

cirs-biz/src/main/java/com/cirs/biz/mapper/TEvaluationMapper.java

@@ -1,7 +1,9 @@
 package com.cirs.biz.mapper;
 
+import java.util.HashMap;
 import java.util.List;
 import com.cirs.biz.domain.TEvaluation;
+import com.cirs.biz.domain.avgEvaluation;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -60,5 +62,7 @@ public interface TEvaluationMapper
      */
     public int deleteTEvaluationByIds(Long[] ids);
 
-    public float getscore(@Param("componentid") String componentid);
+    public Float getscore(@Param("componentid") String componentid);
+
+    public List<avgEvaluation> get_top10();
 }

cirs-biz/src/main/java/com/cirs/biz/service/ITEvaluationService.java

@@ -1,7 +1,9 @@
 package com.cirs.biz.service;
 
+import java.util.HashMap;
 import java.util.List;
 import com.cirs.biz.domain.TEvaluation;
+import com.cirs.biz.domain.avgEvaluation;
 
 /**
  * 评价Service接口
@@ -59,5 +61,7 @@ public interface ITEvaluationService
      */
     public int deleteTEvaluationById(Long id);
 
-    public float getscore(String componentid);
+    public Float getscore(String componentid);
+
+    public List<avgEvaluation> get_top10();
 }

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationTaskDetailService.java

@@ -59,7 +59,9 @@ public interface ITVerificationTaskDetailService
      */
     public int deleteTVerificationTaskDetailById(Long id);
 
-    public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName);
+//    public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName);
+
+    String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName, String fileName);
 
     public List<TVerificationTaskDetail> selectTVerificationTaskDetailByTaskIds(List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/service/impl/TEvaluationServiceImpl.java

@@ -1,6 +1,9 @@
 package com.cirs.biz.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+
+import com.cirs.biz.domain.avgEvaluation;
 import com.cirs.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,7 +98,13 @@ public class TEvaluationServiceImpl implements ITEvaluationService
     }
 
     @Override
-    public float getscore(String componentid) {
+    public Float getscore(String componentid) {
+
         return tEvaluationMapper.getscore(componentid);
     }
+
+    @Override
+    public List<avgEvaluation> get_top10() {
+        return tEvaluationMapper.get_top10();
+    }
 }

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -114,7 +114,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     }
 
     @Override
-    public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName) {
+    public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName, String fileName) {
 //        // todo WangRunLin refactor code
 //        String msg = null;
 //        // 1 new a task and insert
@@ -142,9 +142,11 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
         TVerificationTask task = new TVerificationTask();
 
         task.setCreateBy(operName);//setCreateBy(operName)
-        //        task.setTaskStatus("0");
+        task.setTaskStatus("未运行");
+
         // todo taskName 使用文件名称，文件名称应该在导入的MultipartFile里能获取到
 //                task.setTaskName("undefined");
+        task.setTaskName(fileName);
         task.setCreateTime(new Date());
 
         tVerificationTaskMapper.insertTVerificationTask(task);
@@ -161,7 +163,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
 
                 tVerificationTaskDetailMapper.insertTVerificationTaskDetail(taskDetail);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + " 详情导入成功");
+                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + "详情导入成功");
 
             }
             catch (Exception e)

cirs-biz/src/main/resources/mapper/biz/TEvaluationMapper.xml

@@ -15,10 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="useScene" column="use_scene"/>
     </resultMap>
 
     <sql id="selectTEvaluationVo">
-        select id, search_condition, component_id, mark, used_by, create_by, create_time, update_by, update_time, remark from t_evaluation
+        select id, search_condition, component_id, mark, used_by, create_by, create_time, update_by, update_time, remark,use_scene from t_evaluation
     </sql>
 
     <select id="selectTEvaluationList" parameterType="TEvaluation" resultMap="TEvaluationResult">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="componentId != null  and componentId != ''"> and component_id = #{componentId}</if>
             <if test="mark != null "> and mark = #{mark}</if>
             <if test="usedBy != null  and usedBy != ''"> and used_by = #{usedBy}</if>
+            <if test="useScene != null and useScene != ''">and use_scene = #{useScene}</if>
         </where>
     </select>
     
@@ -35,9 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTEvaluationVo"/>
         where id = #{id}
     </select>
+
     <select id="getscore" resultType="java.lang.Float">
         select mark from t_evaluation where component_id=#{componentid} order by id desc limit 1
     </select>
+    <select id="get_top10" resultType="com.cirs.biz.domain.avgEvaluation">
+        select t_evaluation.component_id as componentId,t_electron_component.component_name as componentName,
+               avg(mark) as score
+            from t_evaluation,t_electron_component
+                where t_electron_component.id = t_evaluation.component_id
+                    group by t_evaluation.component_id order by score desc limit 10
+    </select>
+
 
     <insert id="insertTEvaluation" parameterType="TEvaluation" useGeneratedKeys="true" keyProperty="id">
         insert into t_evaluation
@@ -51,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="useScene != null">use_scene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="searchCondition != null">#{searchCondition},</if>
@@ -62,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="useScene != null">#{useScene},</if>
          </trim>
     </insert>
 
@@ -77,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="useScene != null">use_scene = #{useScene},</if>
         </trim>
         where id = #{id}
     </update>

cirs-biz/src/main/resources/mapper/biz/TPageViewTimeMapper.xml

@@ -8,16 +8,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="componentId"    column="component_id"    />
         <result property="viewTime"    column="view_time"    />
-        <result property="usedBy"    column="used_by"    />
+        <result property="useScene"    column="use_scene"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="searchCondition"    column="search_condition"    />
     </resultMap>
 
     <sql id="selectTPageViewTimeVo">
-        select id, component_id, view_time, used_by, create_by, create_time, update_by, update_time, remark from t_page_view_time
+        select id, component_id, view_time, use_scene, create_by, create_time, update_by, update_time, remark,search_condition from t_page_view_time
     </sql>
 
     <select id="selectTPageViewTimeList" parameterType="TPageViewTime" resultMap="TPageViewTimeResult">
@@ -25,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="componentId != null  and componentId != ''"> and component_id = #{componentId}</if>
             <if test="viewTime != null "> and view_time = #{viewTime}</if>
-            <if test="usedBy != null  and usedBy != ''"> and used_by = #{usedBy}</if>
+            <if test="useScene != null  and useScene != ''"> and use_scene = #{useScene}</if>
+            <if test="searchCondition != null  and searchCondition != ''"> and search_condition = #{searchCondition}</if>
         </where>
     </select>
     
@@ -39,22 +41,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="componentId != null">component_id,</if>
             <if test="viewTime != null">view_time,</if>
-            <if test="usedBy != null">used_by,</if>
+            <if test="useScene != null">use_scene,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="searchCondition != null">search_condition,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="componentId != null">#{componentId},</if>
             <if test="viewTime != null">#{viewTime},</if>
-            <if test="usedBy != null">#{usedBy},</if>
+            <if test="useScene != null">#{useScene},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="searchCondition != null">#{searchCondition},</if>
          </trim>
     </insert>
 
@@ -63,12 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="componentId != null">component_id = #{componentId},</if>
             <if test="viewTime != null">view_time = #{viewTime},</if>
-            <if test="usedBy != null">used_by = #{usedBy},</if>
+            <if test="useScene != null">use_scene = #{useScene},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="searchCondition != null">search_condition = #{searchCondition},</if>
         </trim>
         where id = #{id}
     </update>

cirs-biz/src/main/resources/mapper/biz/TVerificationTaskDetailMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="calculate1"    column="calculate1"    />
         <result property="calculate2"    column="calculate2"    />
         <result property="calculate3"    column="calculate3"    />
+        <result property="calculate4"    column="calculate4"    />
+        <result property="calculate5"    column="calculate5"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTVerificationTaskDetailVo">
-        select id, task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
+        select id, task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3,calculate4,calculate5, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
     </sql>
 
     <select id="selectTVerificationTaskDetailList" parameterType="TVerificationTaskDetail" resultMap="TVerificationTaskDetailResult">
@@ -42,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calculate1 != null  and calculate1 != ''"> and calculate1 = #{calculate1}</if>
             <if test="calculate2 != null  and calculate2 != ''"> and calculate2 = #{calculate2}</if>
             <if test="calculate3 != null  and calculate3 != ''"> and calculate3 = #{calculate3}</if>
-
+            <if test="calculate4 != null  and calculate4 != ''"> and calculate4 = #{calculate4}</if>
+            <if test="calculate5 != null  and calculate5 != ''"> and calculate5 = #{calculate5}</if>
         </where>
     </select>
     
@@ -52,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTVerificationTaskDetailByTaskIds"
             resultType="com.cirs.biz.domain.TVerificationTaskDetail" resultMap="TVerificationTaskDetailResult">
-        select task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
+        select task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3,calculate4,calculate5, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
             where task_id in
         <foreach item="item" collection="taskids" index="index" open="(" separator="," close=")">
             #{item}
@@ -62,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTVerificationTaskDetail" parameterType="TVerificationTaskDetail" useGeneratedKeys="true" keyProperty="id">
         insert into t_verification_task_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
+            <if test="taskId != null">task_id,</if>
             <if test="useScene != null">use_scene,</if>
             <if test="searchCondition != null">search_condition,</if>
             <if test="result1 != null">result1,</if>
@@ -73,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calculate1 != null">calculate1,</if>
             <if test="calculate2 != null">calculate2,</if>
             <if test="calculate3 != null">calculate3,</if>
+            <if test="calculate4 != null">calculate4,</if>
+            <if test="calculate5 != null">calculate5,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -80,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-
+            <if test="taskId != null">#{taskId},</if>
             <if test="useScene != null">#{useScene},</if>
             <if test="searchCondition != null">#{searchCondition},</if>
             <if test="result1 != null">#{result1},</if>
@@ -91,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calculate1 != null">#{calculate1},</if>
             <if test="calculate2 != null">#{calculate2},</if>
             <if test="calculate3 != null">#{calculate3},</if>
+            <if test="calculate4 != null">#{calculate4},</if>
+            <if test="calculate5 != null">#{calculate5},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -113,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calculate1 != null">calculate1 = #{calculate1},</if>
             <if test="calculate2 != null">calculate2 = #{calculate2},</if>
             <if test="calculate3 != null">calculate3 = #{calculate3},</if>
+            <if test="calculate4 != null">calculate4 = #{calculate4},</if>
+            <if test="calculate5 != null">calculate5 = #{calculate5},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

cirs-common/src/main/java/com/cirs/common/core/redis/RedisCache.java

@@ -139,6 +139,7 @@ public class RedisCache
     public <T> long setCacheList(final String key, final List<T> dataList)
     {
         Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+
         return count == null ? 0 : count;
     }
 

cirs-common/src/main/java/com/cirs/common/utils/file/FileTypeUtils.java

@@ -13,7 +13,7 @@ public class FileTypeUtils
     /**
      * 获取文件类型
      * <p>
-     * 例如: ruoyi.txt, 返回: txt
+     * 例如: cirs.txt, 返回: txt
      * 
      * @param file 文件名
      * @return 后缀（不含".")
@@ -30,7 +30,7 @@ public class FileTypeUtils
     /**
      * 获取文件类型
      * <p>
-     * 例如: ruoyi.txt, 返回: txt
+     * 例如: cirs.txt, 返回: txt
      *
      * @param fileName 文件名
      * @return 后缀（不含".")

cirs-common/src/main/java/com/cirs/common/utils/file/FileUtils.java

@@ -256,7 +256,7 @@ public class FileUtils
     }
 
     /**
-     * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
+     * 获取文件名称 /profile/upload/2022/04/16/cirs.png -- cirs.png
      * 
      * @param fileName 路径名称
      * @return 没有文件路径的名称
@@ -274,7 +274,7 @@ public class FileUtils
     }
 
     /**
-     * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+     * 获取不带后缀文件名称 /profile/upload/2022/04/16/cirs.png -- cirs
      * 
      * @param fileName 路径名称
      * @return 没有文件路径和后缀的名称

cirs-framework/src/main/java/com/cirs/framework/web/service/PermissionService.java

@@ -10,7 +10,7 @@ import com.cirs.common.utils.StringUtils;
 import com.cirs.framework.security.context.PermissionContextHolder;
 
 /**
- * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
+ * cirs首创 自定义权限实现，ss取自SpringSecurity首字母
  * 
  * @author allen
  */

cirs-generator/src/main/java/com/cirs/generator/controller/GenController.java

@@ -206,7 +206,7 @@ public class GenController extends BaseController
         response.reset();
         response.addHeader("Access-Control-Allow-Origin", "*");
         response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+        response.setHeader("Content-Disposition", "attachment; filename=\"cirs.zip\"");
         response.addHeader("Content-Length", "" + data.length);
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());

cirs-generator/src/main/resources/vm/vue/v3/readme.txt

@@ -1 +1 @@
-如果使用的是RuoYi-Vue3前端，那么需要覆盖一下此目录的模板index.vue.vm、index-tree.vue.vm文件到上级vue目录。
+锟斤拷锟绞癸拷玫锟斤拷锟絚irs-Vue3前锟剿ｏ拷锟斤拷么锟斤拷要锟斤拷锟斤拷一锟铰达拷目录锟斤拷模锟斤拷index.vue.vm锟斤拷index-tree.vue.vm锟侥硷拷锟斤拷锟较硷拷vue目录锟斤拷

cirs-quartz/src/main/java/com/cirs/quartz/config/ScheduleConfig.java

@@ -22,7 +22,7 @@
 //
 //        // quartz参数
 //        Properties prop = new Properties();
-//        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
+//        prop.put("org.quartz.scheduler.instanceName", "cirsScheduler");
 //        prop.put("org.quartz.scheduler.instanceId", "AUTO");
 //        // 线程池配置
 //        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
@@ -42,7 +42,7 @@
 //        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
 //        factory.setQuartzProperties(prop);
 //
-//        factory.setSchedulerName("RuoyiScheduler");
+//        factory.setSchedulerName("cirsScheduler");
 //        // 延时启动
 //        factory.setStartupDelay(1);
 //        factory.setApplicationContextSchedulerContextKey("applicationContextKey");

cirs-quartz/src/main/java/com/cirs/quartz/task/TimingTask.java

@@ -0,0 +1,16 @@
+package com.cirs.quartz.task;
+
+import com.cirs.common.core.redis.RedisCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("TimingTask")
+public class TimingTask {
+    @Autowired
+    private RedisCache redisCache;
+
+    public void startTask(){
+        System.out.println("定时任务启动");
+        redisCache.deleteObject("top10_components");
+    }
+}

cirs-ui/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ruoyi",
+  "name": "cirs",
   "version": "1.0.0",
   "description": "元器件智能推荐系统",
   "author": "若依",
@@ -33,7 +33,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+    "url": "https://gitee.com/y_project/cirs-Vue.git"
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",

cirs-ui/src/api/biz/evaluation.js

@@ -50,5 +50,12 @@ export function getall() {
   })
 }
 
+export function get_top10(){
+  return request({
+    url: '/biz/evaluation/get_top10',
+    method: 'get'
+  })
+}
+
 
 

cirs-ui/src/api/system/user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/cirs";
 
 // 查询用户列表
 export function listUser(query) {

cirs-ui/src/components/RuoYi/Doc/index.vue → cirs-ui/src/components/cirs/Doc/index.vue

@@ -6,10 +6,10 @@
 
 <script>
 export default {
-  name: 'RuoYiDoc',
+  name: 'cirsDoc',
   data() {
     return {
-      url: 'http://doc.ruoyi.vip/ruoyi-vue'
+      url: 'http://doc.cirs.vip/cirs-vue'
     }
   },
   methods: {
@@ -18,4 +18,4 @@ export default {
     }
   }
 }
-</script>
+</script>

cirs-ui/src/components/RuoYi/Git/index.vue → cirs-ui/src/components/cirs/Git/index.vue

@@ -6,10 +6,10 @@
 
 <script>
 export default {
-  name: 'RuoYiGit',
+  name: 'cirsGit',
   data() {
     return {
-      url: 'https://gitee.com/y_project/RuoYi-Vue'
+      url: 'https://gitee.com/y_project/cirs-Vue'
     }
   },
   methods: {
@@ -18,4 +18,4 @@ export default {
     }
   }
 }
-</script>
+</script>

cirs-ui/src/directive/dialog/drag.js

@@ -1,6 +1,6 @@
 /**
 * v-dialogDrag 弹窗拖拽
-* Copyright (c) 2019 ruoyi
+* Copyright (c) 2019 cirs
 */
 
 export default {
@@ -61,4 +61,4 @@ export default {
       };
     }
   }
-};
+};

cirs-ui/src/directive/module/clipboard.js

@@ -1,6 +1,6 @@
 /**
 * v-clipboard 文字复制剪贴
-* Copyright (c) 2021 ruoyi
+* Copyright (c) 2021 cirs
 */
 
 import Clipboard from 'clipboard'

cirs-ui/src/layout/components/Navbar.vue

@@ -10,11 +10,11 @@
         <search id="header-search" class="right-menu-item" />
 
 <!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
+<!--          <ruo-yi-git id="cirs-git" class="right-menu-item hover-effect" />-->
 <!--        </el-tooltip>-->
 
 <!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+<!--          <ruo-yi-doc id="cirs-doc" class="right-menu-item hover-effect" />-->
 <!--        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -54,8 +54,8 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import cirsGit from '@/components/cirs/Git'
+import cirsDoc from '@/components/cirs/Doc'
 
 export default {
   components: {
@@ -65,8 +65,8 @@ export default {
     Screenfull,
     SizeSelect,
     Search,
-    RuoYiGit,
-    RuoYiDoc
+    cirsGit,
+    cirsDoc
   },
   computed: {
     ...mapGetters([

cirs-ui/src/main.js

@@ -6,7 +6,7 @@ import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/cirs.scss' // cirs css
 import App from './App'
 import store from './store'
 import router from './router'
@@ -18,7 +18,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/cirs";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件

cirs-ui/src/plugins/download.js

@@ -3,7 +3,7 @@ import { Message } from 'element-ui'
 import { saveAs } from 'file-saver'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { blobValidate } from "@/utils/ruoyi";
+import { blobValidate } from "@/utils/cirs";
 
 const baseURL = process.env.VUE_APP_BASE_API
 

cirs-ui/src/utils/dict/Dict.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/cirs";
 import DictMeta from './DictMeta'
 import DictData from './DictData'
 

cirs-ui/src/utils/dict/DictMeta.js

@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/cirs";
 import DictOptions from './DictOptions'
 
 /**

cirs-ui/src/utils/dict/DictOptions.js

@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/cirs";
 import dictConverter from './DictConverter'
 
 export const options = {

cirs-ui/src/utils/index.js

@@ -1,16 +1,16 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from './cirs'
 
 /**
  * 表格时间格式化
  */
 export function formatDate(cellValue) {
   if (cellValue == null || cellValue == "") return "";
-  var date = new Date(cellValue) 
+  var date = new Date(cellValue)
   var year = date.getFullYear()
   var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
@@ -330,7 +330,7 @@ export function makeMap(str, expectsLowerCase) {
     ? val => map[val.toLowerCase()]
     : val => map[val]
 }
- 
+
 export const exportDefault = 'export default '
 
 export const beautifierConf = {
@@ -387,4 +387,4 @@ export function camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
- 
+

cirs-ui/src/utils/request.js

@@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import { tansParams, blobValidate } from "@/utils/cirs";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 

cirs-ui/src/views/biz/evaluation/index.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="使用场景" prop="useScene">
+      <el-select v-model="queryParams.useScene" placeholder="请选择使用场景">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
       <el-form-item label="元器件编号" prop="componentId" label-width="200px">
 <!--        <el-input-->
 <!--          v-model="queryParams.componentId"-->
@@ -8,6 +18,7 @@
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
+
         <el-select v-model="queryParams.componentId" filterable placeholder="请输入元器件编号">
           <el-option
             v-for="item in componentInfo"
@@ -84,9 +95,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="evaluationList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="编号" align="center" prop="id" />-->
-      <el-table-column label="查询条件" align="center" prop="searchCondition" />
+      <el-table-column label="查询条件" align="center" prop="searchCondition" :show-overflow-tooltip="true"/>
       <el-table-column label="元器件编号" align="center" prop="componentId" :show-overflow-tooltip="true"/>
       <el-table-column label="元器件名称" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -104,8 +115,8 @@
         </template>
       </el-table-column>
       <el-table-column label="评分" align="center" prop="mark" />
-      <el-table-column label="使用场景" align="center" prop="usedBy" :show-overflow-tooltip="true"/>
-
+      <el-table-column label="应用设备" align="center" prop="usedBy" :show-overflow-tooltip="true"/>
+      <el-table-column label="使用场景" align="center" prop = "useScene" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -136,8 +147,8 @@
     />
 
     <!-- 添加或修改评价对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="查询条件" prop="searchCondition">
           <el-input v-model="form.searchCondition" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -152,8 +163,18 @@
         <el-form-item label="评分" prop="mark">
           <el-input v-model="form.mark" placeholder="请输入评分" />
         </el-form-item>
-        <el-form-item label="使用场景" prop="usedBy">
-          <el-input v-model="form.usedBy" placeholder="请输入使用场景" />
+        <el-form-item label="应用设备" prop="usedBy">
+          <el-input v-model="form.usedBy" placeholder="请输入应用设备" />
+        </el-form-item>
+        <el-form-item label="使用场景" prop="useScene">
+          <el-select v-model="form.useScene" placeholder="请选择使用场景">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -200,6 +221,7 @@ export default {
         componentId: null,
         mark: null,
         usedBy: null,
+        useScene:null,
       },
       // 表单参数
       form: {},
@@ -209,6 +231,21 @@ export default {
       componentInfo:[],
       evaluationMap : new Map(),
       dataLoaded:false,
+      options:[
+        {
+          value: '质量最优',
+          label: '质量最优'
+        }, {
+          value: '成本最优',
+          label: '成本最优'
+        }, {
+          value: '供货周期最优',
+          label: '供货周期最优'
+        }, {
+          value: '供货量最优',
+          label: '供货量最优'
+        }
+      ],
     };
   },
   async created() {
@@ -286,7 +323,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        useScene:null,
       };
       this.resetForm("form");
     },

cirs-ui/src/views/biz/recommend/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div>
-    <el-select v-model="use_scene" placeholder="请选择">
+    <el-select v-model="use_scene" placeholder="请选择使用场景">
       <el-option
         v-for="item in options"
         :key="item.value"
@@ -319,6 +319,8 @@ export default {
     evaluate(){
       this.evaluation.mark = this.escore
       this.evaluation.remark = this.eremark
+      this.evaluation.useScene = this.use_scene
+
       addEvaluation(this.evaluation).then(response => {
         // this.$modal.msgSuccess("评分成功");
 
@@ -340,17 +342,21 @@ export default {
       this.open = true;
       this.startTime = Date.now()
       this.pageviewTime.componentId = row.id
-      this.pageviewTime.usedBy = row.applications.toString()
+
     },
 
     //监听元器件详情dialog关闭
     closedialog(){
       this.currentTime = Date.now()
       this.pageviewTime.viewTime = this.currentTime - this.startTime
+      this.pageviewTime.useScene = this.use_scene
+      console.log(this.use_scene)
+      this.pageviewTime.searchCondition = this.searchCondition
       addTime(this.pageviewTime).then(res=>{
         // this.$modal.msgSuccess("详情浏览时间成功")
       })
       console.log("详情关闭")
+      this.open=false
     }
   }
 };

cirs-ui/src/views/biz/record/index.vue

@@ -175,7 +175,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="应用设备" prop="usedBy">
-          <el-input v-model="form.usedBy" placeholder="请输入使用场景" />
+          <el-input v-model="form.usedBy" placeholder="请输入应用设备" />
         </el-form-item>
         <el-form-item label="使用日期" prop="usedDate">
           <el-date-picker clearable

cirs-ui/src/views/biz/task/index.vue

@@ -144,7 +144,7 @@
 
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="任务编号" align="center" prop="id" />
       <el-table-column label="任务名称" align="center" prop="taskName" :show-overflow-tooltip='true'  />
       <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip='true' />
       <el-table-column label="任务数" align="center" prop="subtaskNum" />
@@ -356,7 +356,7 @@ export default {
 
               this.getList();
             });
-          }, 10000);
+          }, 3000);
 
 
         });

cirs-ui/src/views/biz/time/index.vue

@@ -1,7 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
-      <el-form-item label="元器件编号" prop="componentId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+
+      <el-form-item label="使用场景" prop="useScene" label-width="80px">
+        <el-select v-model="queryParams.useScene" placeholder="请选择使用场景">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="元器件编号" prop="componentId" >
         <!--        <el-input-->
         <!--          v-model="queryParams.componentId"-->
         <!--          placeholder="请输入元器件编号"-->
@@ -15,6 +26,8 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
       <el-form-item label="浏览时长（毫秒）" prop="viewTime">
         <el-input
           v-model="queryParams.viewTime"
@@ -23,6 +36,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="查询条件" prop="searchCondition">
+        <el-input
+          v-model="queryParams.searchCondition"
+          placeholder="请输入元器件查询条件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
 <!--      <el-form-item label="使用场景" prop="usedBy">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.usedBy"-->
@@ -31,10 +53,12 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
+      <div align="right" style="padding-right: 80px">
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
+      </div>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -58,18 +82,18 @@
 <!--          @click="handleUpdate"-->
 <!--          v-hasPermi="['biz:time:edit']"-->
 <!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['biz:time:remove']"-->
-<!--        >删除</el-button>-->
 <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biz:time:remove']"
+        >删除</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -84,11 +108,12 @@
     </el-row>
 
     <el-table v-loading="loading" :data="timeList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="编号" align="center" prop="id" />-->
       <el-table-column label="元器件编号" align="center" prop="componentId" />
       <el-table-column label="浏览时长（毫秒）" align="center" prop="viewTime" />
-      <el-table-column label="使用场景" align="center" prop="usedBy" :show-overflow-tooltip='true' />
+      <el-table-column label="使用场景" align="center" prop="useScene" :show-overflow-tooltip='true' />
+      <el-table-column label="查询条件" align="center" prop="searchCondition" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip='true' />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,7 +145,7 @@
 
     <!-- 添加或修改页面浏览时长对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="元器件编号" prop="componentId">
           <!--          <el-input v-model="form.componentId" placeholder="请输入元器件编号" />-->
           <el-select v-model="form.componentId" filterable placeholder="请输入元器件编号">
@@ -133,8 +158,11 @@
         <el-form-item label="浏览时长（毫秒）" prop="viewTime">
           <el-input v-model="form.viewTime" placeholder="请输入浏览时长" />
         </el-form-item>
-        <el-form-item label="使用场景" prop="usedBy">
-          <el-input v-model="form.usedBy" placeholder="请输入使用场景" />
+        <el-form-item label="使用场景" prop="usedScene">
+          <el-input v-model="form.usedScene" placeholder="请输入使用场景" />
+        </el-form-item>
+        <el-form-item label="查询条件" prop="searchCondition">
+          <el-input v-model="form.searchCondition" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -180,13 +208,29 @@ export default {
         pageSize: 10,
         componentId: null,
         viewTime: null,
-        usedBy: null,
+        usedScene: null,
+        searchCondition:null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      options:[
+        {
+          value: '质量最优',
+          label: '质量最优'
+        }, {
+          value: '成本最优',
+          label: '成本最优'
+        }, {
+          value: '供货周期最优',
+          label: '供货周期最优'
+        }, {
+          value: '供货量最优',
+          label: '供货量最优'
+        }
+      ],
     };
   },
   async created() {
@@ -219,12 +263,13 @@ export default {
         id: null,
         componentId: null,
         viewTime: null,
-        usedBy: null,
+        usedScene: null,
         createBy: null,
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        searchCondition:null,
       };
       this.resetForm("form");
     },

cirs-ui/src/views/index.vue

@@ -1,20 +1,231 @@
 <template>
+
   <div class="app-container home">
+    <div style="text-align: right">
+      <el-button type="primary" @click="recommend">推荐元器件</el-button>
+    </div>
+
+
+    <el-carousel :interval="5000" type="card" height="380px">
+      <el-carousel-item v-for="img in imgs" :key="img" >
+
+          <img :src="img" alt="图片无法加载" style="object-fit: scale-down; width:100%;height:100%" class="image"/>
+
+      </el-carousel-item>
+    </el-carousel>
+
+    <div align="center" style="font-size: 18px"> 评分最高的10个元器件
+    <el-row >
+      <el-col :span="12" v-for="idx in topten.length" :key="idx" >
+        <el-card :body-style="{ padding: '0px' }" style="font-size: 20px;background-color: #d3dce6">
+
+          <div style="padding: 34px;">
+            <td>
+
+            <span>
+              <el-button
+
+                type="text"
+                @click="handleDetail(topten[idx-1].componentId)"
+
+              >{{ topten[idx-1].componentName}} </el-button>
+
+            </span>
+            <span style="font-size: 14px"> 评分：</span>
+            </td>
+            <td>
+            <el-rate
+              v-model="topten[idx-1].score"
+              disabled
+              show-score
+              text-color="#ff9900"
+
+            >
+            </el-rate>
+            </td>
+
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    </div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="closedialog">
+
+      <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="200px">
+        <h2><b>元器件基本信息</b></h2>
+        <el-form-item label="元器件名称" prop="componentName">
+          <el-input v-model="form.componentName" readonly='true' />
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" readonly='true' />
+        </el-form-item>
+        <el-form-item label="型号规格" prop="componentModel">
+          <el-input v-model="form.componentModel" readonly='true' />
+        </el-form-item>
+        <el-form-item label="国产替代型号" prop="replaceDomesticModel">
+          <el-input v-model="form.replaceDomesticModel" readonly='true' />
+        </el-form-item>
+        <el-form-item label="质量等级" prop="qualityGrade">
+          <el-input v-model="form.qualityGrade" readonly='true' />
+        </el-form-item>
+        <el-form-item label="供货周期" prop="deliveryCycle">
+          <el-input v-model="form.deliveryCycle" readonly='true' />
+        </el-form-item>
+        <el-form-item label="供货量(个/年）" prop="supplyQuantity">
+          <el-input v-model="form.supplyQuantity" readonly='true' />
+        </el-form-item>
+        <el-form-item label="价格" prop="unitPrice">
+          <el-input v-model="form.unitPrice" readonly='true' />
+        </el-form-item>
+        <el-form-item label="ZZKK等级" prop="zzkkLevel">
+          <el-input v-model="form.zzkkLevel" readonly='true' />
+        </el-form-item>
+        <el-form-item label="是否在优选目录内" prop="inPreference">
+          <el-input v-model="form.inPreference" readonly='true' />
+        </el-form-item>
+        <el-form-item label="停产断档日期" prop="shutdownDate">
+          <el-date-picker clearable
+                          v-model="form.shutdownDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          readonly='true'>
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="封装形式" prop="encapsulationMode">
+          <el-input v-model="form.encapsulationMode" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大正向电流IFM" prop="paramIfm" v-if="form.paramIfm!==null && form.paramIfm!==''">
+          <el-input v-model="form.paramIfm" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大反向工作电压VRRM" prop="paramVrrm" v-if="form.paramVrrm!==null && form.paramVrrm!==''">
+          <el-input v-model="form.paramVrrm" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大浪涌电流IFSM" prop="paramIfsm" v-if="form.paramIfsm!==null && form.paramIfsm!==''">
+          <el-input v-model="form.paramIfsm" readonly='true' />
+        </el-form-item>
+        <el-form-item label="稳压状态下的动态电阻ZZ" prop="paramZz" v-if="form.paramZz!==null && form.paramZz!==''">
+          <el-input v-model="form.paramZz" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大额定功率PCM" prop="paramPcm" v-if="form.paramPcm!==null && form.paramPcm!==''">
+          <el-input v-model="form.paramPcm" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大集电极电流ICM" prop="paramIcm" v-if="form.paramIcm!==null && form.paramIcm!==''">
+          <el-input v-model="form.paramIcm" readonly='true' />
+        </el-form-item>
+        <el-form-item label="最大集电极-基极电压VCBO" prop="paramVcbo" v-if="form.paramVcbo!==null && form.paramVcbo!==''">
+          <el-input v-model="form.paramVcbo" readonly='true' />
+        </el-form-item>
+        <el-form-item label="集电极-发射极电压VCEO" prop="paramVceo" v-if="form.paramVceo!==null && form.paramVceo!==''">
+          <el-input v-model="form.paramVceo" readonly='true' />
+        </el-form-item>
+        <el-form-item label="发射极-基极电压VEBO" prop="paramVebo" v-if="form.paramVebo!==null && form.paramVebo!==''">
+          <el-input v-model="form.paramVebo" readonly='true' />
+        </el-form-item>
+        <el-form-item label="漏源电压VDSS" prop="paramVdss" v-if="form.paramVdss!==null && form.paramVdss!==''">
+          <el-input v-model="form.paramVdss" readonly='true' />
+        </el-form-item>
+        <el-form-item label="漏极直流电流ID" prop="paramId" v-if="form.paramId!==null && form.paramId!==''">
+          <el-input v-model="form.paramId" readonly='true' />
+        </el-form-item>
+        <el-form-item label="漏-源通态电阻RDS(on)" prop="paramRdsOn" v-if="form.paramRdsOn!==null && form.paramRdsOn!==''">
+          <el-input v-model="form.paramRdsOn" readonly='true' />
+        </el-form-item>
+        <el-form-item label="抗静电能力" prop="antistaticCapacity">
+          <el-input v-model="form.antistaticCapacity" readonly='true' />
+        </el-form-item>
+        <el-form-item label="抗辐照能力" prop="radiationResistance">
+          <el-input v-model="form.radiationResistance" readonly='true' />
+        </el-form-item>
+        <el-form-item label="材料" prop="materials">
+          <el-input v-model="form.materials" type="textarea" readonly='true'/>
+        </el-form-item>
+        <el-form-item label="工艺" prop="craft">
+          <el-input v-model="form.craft" type="textarea" readonly='true' />
+        </el-form-item>
+        <el-form-item label="重量" prop="weight">
+          <el-input v-model="form.weight" readonly='true' />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" readonly='true' />
+        </el-form-item>
+      </el-form>
+
+
+
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { get_top10} from "@/api/biz/evaluation";
+import { getComponent,getBycomponentId,addTime } from "@/api/biz/recommend";
 export default {
   name: "Index",
   data() {
     return {
       // 版本号
-      version: "1.0.0"
+      currentTime:0,
+      startTime:0,
+      version: "1.0.0",
+      form: {},
+      title:'',
+      topten:[],
+      currentDate: new Date(),
+      open:false,
+      imgs:[
+        require('@/assets/images/img1.jpg'),
+        require('@/assets/images/img2.jpg'),
+        require('@/assets/images/img3.jpg'),
+        require('@/assets/images/img4.jpg'),
+        require('@/assets/images/img5.jpg'),
+        require('@/assets/images/img6.jpg')
+      ],
+      pageviewTime:{},
     };
   },
+  created() {
+    this.get_top_ten()
+  },
   methods: {
     goTarget(href) {
       window.open(href, "_blank");
+    },
+    get_top_ten(){
+      get_top10().then(res=>{
+        this.topten = res.data;
+        console.log(this.topten)
+      })
+    },
+    recommend(){
+      this.$router.push('/recommend')
+    },
+    handleDetail(id) {
+
+      getComponent(id).then(response => {
+        this.form = response.data;
+        this.title = "元器件详情";
+
+      });
+      getBycomponentId(id).then(res=>{
+        this.useInfoList = res.data
+      })
+      this.open = true;
+      this.startTime = Date.now()
+      this.pageviewTime.componentId = id
+      // this.pageviewTime.usedBy = row.applications.toString()
+    },
+
+    //监听元器件详情dialog关闭
+    closedialog(){
+      // this.currentTime = Date.now()
+      // this.pageviewTime.viewTime = this.currentTime - this.startTime
+      // // this.pageviewTime.useScene = this.use_scene
+      // // console.log(this.use_scene)
+      // this.pageviewTime.searchCondition = this.searchCondition
+      // addTime(this.pageviewTime).then(res=>{
+      //   // this.$modal.msgSuccess("详情浏览时间成功")
+      // })
+      this.open = false
     }
   }
 };
@@ -81,6 +292,19 @@ export default {
       padding-inline-start: 40px;
     }
   }
+
+
+  .el-carousel__item:nth-child(2n) {
+    background-color: #99a9bf;
+  }
+
+  .el-carousel__item:nth-child(2n+1) {
+    background-color: #d3dce6;
+  }
+
 }
+
+
 </style>
 
+

cirs-ui/src/views/index_v1.vue

@@ -25,7 +25,7 @@
       </el-col>
     </el-row>
 
-    
+
   </div>
 </template>
 

cirs-ui/src/views/monitor/job/index.vue

@@ -179,7 +179,7 @@
                 <el-tooltip placement="top">
                   <div slot="content">
                     Bean调用示例：ryTask.ryParams('ry')
-                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                    <br />Class类调用示例：com.cirs.quartz.task.RyTask.ryParams('ry')
                     <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                   </div>
                   <i class="el-icon-question"></i>

cirs-ui/src/views/tool/gen/genInfoForm.vue

@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.cirs.system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>

cirs-ui/src/views/tool/gen/index.vue

@@ -267,7 +267,7 @@ export default {
           this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
         });
       } else {
-        this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip");
+        this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "cirs.zip");
       }
     },
     /** 同步数据库操作 */

cirs-ui/vue.config.js

@@ -17,7 +17,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  // 例如 https://www.cirs.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.cirs.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
@@ -59,7 +59,7 @@ module.exports = {
       }
     },
     plugins: [
-      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+      // http://doc.cirs.vip/cirs-vue/other/faq.html#使用gzip解压缩静态文件
       new CompressionPlugin({
         cache: false,                   // 不启用文件缓存
         test: /\.(js|css|html)?$/i,     // 压缩文件格式