mac代码上传

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/IdentifierStatusController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.CxSelect;
+import com.ruoyi.common.core.domain.entity.SysIdentifier;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.json.JSONObject;
 import com.ruoyi.common.json.JSONObject.JSONArray;
@@ -58,7 +59,9 @@ public class IdentifierStatusController
 
     @PostMapping("/list")
     public TableDataInfo list(){
-        return new TableDataInfo();
+
+       List<SysIdentifier> list = identifierStatusService.selectIdentifierStatus();
+        return new TableDataInfo(list, 0);
     }
     /**
      * 时间轴

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysIdentifierMapper.java

@@ -30,4 +30,6 @@ public interface SysIdentifierMapper
     SysIdentifier selectNormalIdentifierById(Long id);
 
     int updateNormalIdentifier(SysIdentifier identifier);
+
+    List<SysIdentifier> selectAllIdentifierList();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IdentifierStatusService.java

@@ -11,4 +11,6 @@ import java.util.List;
  */
 public interface IdentifierStatusService
 {
+    List<SysIdentifier> selectIdentifierStatus();
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IdentifierStatusServiceImpl.java

@@ -22,4 +22,11 @@ public class IdentifierStatusServiceImpl implements IdentifierStatusService
 {
     private static final Logger log = LoggerFactory.getLogger(IdentifierStatusServiceImpl.class);
 
+    @Autowired
+    private SysIdentifierMapper identifierMapper;
+    @Override
+    public List<SysIdentifier> selectIdentifierStatus() {
+        List<SysIdentifier> sysIdentifiers = identifierMapper.selectAllIdentifierList();
+        return sysIdentifiers;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysIdentifierMapper.xml

@@ -131,6 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</set>
 		where id = #{id}
 	</update>
-
+	<select id="selectAllIdentifierList" resultMap="SysIdentifierResult">
+		select i.id,i.identifier_id,i.identifier_two,i.ladle_number,i.create_by,i.create_time,i.update_by,i.update_time,i.remark,i.del_flag from sys_identifier i
+		where i.del_flag = '0' and i.type = 0
+	</select>
 	
 </mapper>