Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDictController.java

 package cn.wise.sc.acquisition.business.controller;
 
-
+import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import com.baomidou.mybatisplus.extension.api.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+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;
@@ -13,9 +20,43 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ztw
  * @since 2021-04-23
  */
+@Api(tags = "字典表功能")
 @RestController
 @RequestMapping("/business/t-sys-dict")
 public class TSysDictController {
 
+	@Autowired
+	private ITSysDictService dictService;
+
+
+	@ApiOperation(value = "字典列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "Type",
+					value = "类型：" +
+					"每日开始日期、单位类型、物资类型、" +
+					"生产工序、职务管理、装车内容、运输内容、" +
+					"设备性质、设备状态、物资用途、破碎工作内容、" +
+					"破碎站、辅助消耗、点检结果" +
+					"", paramType = "query", dataType = "Type")
+	})
+	@GetMapping("/getPage")
+	public R choseList(String Type){
+		return dictService.choseList(Type);
+
+
+
+	}
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDictService.java

@@ -5,6 +5,8 @@ import cn.wise.sc.acquisition.business.model.query.TSysDictQuery;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务类
@@ -15,6 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITSysDictService extends IService<TSysDict> {
 
+    R<List<TSysDict>> choseList(String Type);
+
     R<String> getTagDate(TSysDictQuery tSysDictQuery);
 
     R<String> getNameByQuery(TSysDictQuery tSysDictQuery);

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java

@@ -12,9 +12,11 @@ import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
-
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -28,6 +30,25 @@ import java.time.LocalDateTime;
 @Slf4j
 public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> implements ITSysDictService {
 
+    @Resource
+    private TSysDictMapper dictMapper;
+
+
+    public R choseList(String Type){
+        QueryWrapper<TSysDict>  dictQueryWrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(Type)){
+            dictQueryWrapper.eq("Type", Type);
+        }
+        List<TSysDict>  dictList = dictMapper.selectList(dictQueryWrapper);
+        return R.ok(dictList);
+    }
+
+
+
+
+
+
+
     /**
      * 获取标注日期，将字典中id为6的数据的name字段做比较，
      * 大于name字段记录下一个月，小于该字段记录本月