diff --git a/ccic-business/src/main/resources/bootstrap.yml b/ccic-business/src/main/resources/bootstrap.yml index 95d2dd7..ab65b45 100644 --- a/ccic-business/src/main/resources/bootstrap.yml +++ b/ccic-business/src/main/resources/bootstrap.yml @@ -45,7 +45,7 @@ spring: discovery: group: ${spring.profiles.active} #生产环境 - namespace: safeliab + namespace: safeliab-uat # 配置 config: server-addr: 10.3.67.7:8848 @@ -54,5 +54,5 @@ spring: group: ${spring.profiles.active} file-extension: yaml #生产环境 - namespace: safeliab + namespace: safeliab-uat diff --git a/ccic-entity/src/main/java/com/ccic/safeliab/entity/BaseEntity.java b/ccic-entity/src/main/java/com/ccic/safeliab/entity/BaseEntity.java new file mode 100644 index 0000000..633eb4f --- /dev/null +++ b/ccic-entity/src/main/java/com/ccic/safeliab/entity/BaseEntity.java @@ -0,0 +1,43 @@ +package com.ccic.safeliab.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class BaseEntity { + @JsonSerialize( + using = ToStringSerializer.class + ) + private Long createdBy; + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + private Date createAt; + @JsonSerialize( + using = ToStringSerializer.class + ) + private Long updateBy; + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + private Date updateAt; + private Integer status; + @TableLogic + private Integer isDeleted; + + public BaseEntity() { + } + +} diff --git a/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExDict.java b/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExDict.java new file mode 100644 index 0000000..7e794b5 --- /dev/null +++ b/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExDict.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *
+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.ccic.safeliab.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("ex_dict") +public class ExDict extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ +// @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.ID_WORKER) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long id; + + /** + * 父主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + + /** + * 字典码 + */ + private String code; + + /** + * 字典值 + */ + private Integer dictKey; + + /** + * 字典名称 + */ + private String dictValue; + + /** + * 排序 + */ + private Integer sort; + + /** + * 字典备注 + */ + private String remark; + + +} diff --git a/ccic-entity/src/main/java/com/ccic/safeliab/entity/InsDemo.java b/ccic-entity/src/main/java/com/ccic/safeliab/entity/InsDemo.java new file mode 100644 index 0000000..7db63a4 --- /dev/null +++ b/ccic-entity/src/main/java/com/ccic/safeliab/entity/InsDemo.java @@ -0,0 +1,77 @@ +package com.ccic.safeliab.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + *
+ * 演示 + *
+ * + * @author testjava + * @since 2022-11-05 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("ins_demo") +public class InsDemo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.NONE) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long id; + + /** + * 编码 + */ + private String code; + + /** + * 名称 + */ + private String name; + + /** + * 創建人ID + */ + @JsonFormat(shape = JsonFormat.Shape.STRING) + @TableField(fill = FieldFill.INSERT) + private Long createUser; + + /** + * 修改人ID + */ + @JsonFormat(shape = JsonFormat.Shape.STRING) + @TableField(fill = FieldFill.INSERT) + private Long updateUser; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 状态 + */ + private int status; + + /** + * 删除标识 + */ + private int isDeleted; +} diff --git a/ccic-exam/pom.xml b/ccic-exam/pom.xml index db9f844..2cce39f 100644 --- a/ccic-exam/pom.xml +++ b/ccic-exam/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ccic.safeliab.entity.ExDict;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface DictMapper extends BaseMapper
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.service;
+
+import com.ccic.safeliab.entity.ExDict;
+import com.ccic.safeliab.support.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务类
+ *
+ * @author edwong
+ */
+public interface DictService extends BaseService
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.service;
+
+import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ccic.safeliab.dao.DictMapper;
+import com.ccic.safeliab.entity.ExDict;
+import com.ccic.safeliab.support.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author edwong
+ */
+@Service
+public class DictServiceImpl extends BaseServiceImpl
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ccic.safeliab.entity.Customer;
+import com.ccic.safeliab.vo.CustomerVO;
+
+import java.util.Map;
+
+
+/**
+ * 服务类
+ *
+ * @author edwong
+ */
+public interface StatisticsService {
+
+ Page
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ccic.safeliab.entity.Customer;
+import com.ccic.safeliab.entity.Device;
+import com.ccic.safeliab.entity.User;
+import com.ccic.safeliab.support.Condition;
+import com.ccic.safeliab.util.CcicUtill;
+import com.ccic.safeliab.vo.CustomerVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+
+/**
+ * 服务实现类
+ *
+ * @author edwong
+ */
+@Service
+public class StatisticsServiceImpl implements StatisticsService {
+
+ @Autowired
+ private ICustomerService customerService;
+
+ @Override
+ public Page
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ccic.safeliab.web;
+
+import com.ccic.safeliab.util.R;
+import com.ccic.safeliab.entity.ExDict;
+import com.ccic.safeliab.service.DictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+
+/**
+ * 控制器
+ *
+ * @author Chill
+ */
+@RestController
+@RequestMapping("/ex/dict")
+public class DictController {
+
+ @Autowired
+ private DictService dictService;
+
+ /**
+ * 获取字典
+ *
+ * @return
+ */
+ @GetMapping("/dictionary")
+ public R dictionary(String code) {
+ List