已对接腾讯云实名制和人脸打卡

admin-hanhai-vue/src/views/xcx/ClockInConfList.vue

@@ -0,0 +1,195 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+<!--    <div class="table-page-search-wrapper">-->
+<!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+<!--        <a-row :gutter="24">-->
+<!--        </a-row>-->
+<!--      </a-form>-->
+<!--    </div>-->
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_conf')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <template slot="textSlot" slot-scope="text">
+          <j-ellipsis :value="text"></j-ellipsis>
+        </template>
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <clock-in-conf-modal ref="modalForm" @ok="modalFormOk"></clock-in-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ClockInConfModal from './modules/ClockInConfModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ClockInConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ClockInConfModal
+    },
+    data () {
+      return {
+        description: 'clock_in_conf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'健名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'值',
+            align:"center",
+            dataIndex: 'value',
+            scopedSlots: {customRender: 'textSlot'}
+          },
+          {
+            title:'说明',
+            align:"center",
+            dataIndex: 'info',
+            scopedSlots: {customRender: 'textSlot'}
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/clockinconf/clockInConf/list",
+          delete: "/clockinconf/clockInConf/delete",
+          deleteBatch: "/clockinconf/clockInConf/deleteBatch",
+          exportXlsUrl: "/clockinconf/clockInConf/exportXls",
+          importExcelUrl: "clockinconf/clockInConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'健名',dictCode:''})
+        fieldList.push({type:'string',value:'value',text:'值',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'说明',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue

@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_project_item')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_project_item')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">

admin-hanhai-vue/src/views/xcx/ClockInProjectList.vue

@@ -14,10 +14,10 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator">
           <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('clock_in_project')">导出</a-button>
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
+<!--          <a-button type="primary" icon="download" @click="handleExportXls('clock_in_project')">导出</a-button>-->
+<!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--            <a-button type="primary" icon="import">导入</a-button>-->
+<!--          </a-upload>-->
           <!-- 高级查询区域 -->
           <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
           <a-dropdown v-if="selectedRowKeys.length > 0">

admin-hanhai-vue/src/views/xcx/modules/ClockInConfForm.vue

@@ -0,0 +1,123 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="健名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入健名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <a-textarea v-model="model.value" rows="4" placeholder="请输入值" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-textarea v-model="model.info" rows="4" placeholder="请输入说明" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ClockInConfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/clockinconf/clockInConf/add",
+          edit: "/clockinconf/clockInConf/edit",
+          queryById: "/clockinconf/clockInConf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-conf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ClockInConfForm from './ClockInConfForm'
+
+  export default {
+    name: 'ClockInConfModal',
+    components: {
+      ClockInConfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ClockInConfForm from './ClockInConfForm'
+  export default {
+    name: 'ClockInConfModal',
+    components: {
+      ClockInConfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TencentUtils.java

@@ -4,10 +4,12 @@ import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.fastjson.JSON;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.faceid.v20180301.FaceidClient;
 import com.tencentcloudapi.iai.v20180301.IaiClient;
 import com.tencentcloudapi.iai.v20180301.models.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.config.TencentConfig;
 import org.jeecg.modules.clockinauth.entity.ClockinAuth;
 import org.springframework.beans.factory.annotation.Value;
@@ -188,7 +190,7 @@ public class TencentUtils {
         try {
             DetectFaceRequest req = new DetectFaceRequest();
             req.setMaxFaceNum(1L);
-            req.setImage(clockinAuth.getPic());
+            req.setUrl(clockinAuth.getPic());
             req.setNeedFaceAttributes(1L);
             req.setNeedQualityDetection(1L);
             // 返回的resp是一个DetectFaceResponse的实例，与请求对象对应
@@ -199,7 +201,7 @@ public class TencentUtils {
             request.setGender((long) (gender > 2 ? 0 : gender)); // 1 男 2 女
             request.setQualityControl(4L);
             request.setPersonName(clockinAuth.getName());
-            request.setImage(photo);
+            request.setUrl(photo);
 
             CreatePersonResponse response = client.CreatePerson(request);
             log.info("创建人脸模型返回参数:{}", JSON.toJSONString(response));
@@ -242,20 +244,23 @@ public class TencentUtils {
     /**
      * 人脸验证
      */
-    public static void VerifyFace(String UserId) {
+    public static VerifyFaceResponse VerifyFace(String UserId,String pic,Long qualityControl) {
         try {
             IaiClient client = getIaiClient();
             // 实例化一个请求对象,每个接口都会对应一个request对象
             VerifyFaceRequest req = new VerifyFaceRequest();
             req.setPersonId(UserId);
-            req.setUrl("https://sns-img-hw.xhscdn.com/627e45c8-b78a-d2a5-a262-b9fb1bbe15fc?imageView2/2/w/900/format/webp");
-            req.setQualityControl(4L);
+            req.setUrl(pic);
+            req.setQualityControl(qualityControl);
             // 返回的resp是一个VerifyFaceResponse的实例，与请求对象对应
             VerifyFaceResponse resp = client.VerifyFace(req);
             // 输出json格式的字符串回包
-            System.out.println(VerifyFaceResponse.toJsonString(resp));
+            log.info(VerifyFaceResponse.toJsonString(resp));
+            return resp;
+
         } catch (TencentCloudSDKException e) {
-            System.out.println(e.toString());
+            log.error(e.toString());
+            throw new JeecgBootException("人脸识别错误");
         }
     }
 
@@ -284,4 +289,11 @@ public class TencentUtils {
 
     }
 
+    public static void IdCardVerify(){
+
+
+        IaiClient client = getIaiClient();
+
+    }
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/controller/ClockInConfController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.clockinconf.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.clockinconf.entity.ClockInConf;
+import org.jeecg.modules.clockinconf.service.IClockInConfService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: clock_in_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-11-18
+ * @Version: V1.0
+ */
+@Api(tags="clock_in_conf")
+@RestController
+@RequestMapping("/clockinconf/clockInConf")
+@Slf4j
+public class ClockInConfController extends JeecgController<ClockInConf, IClockInConfService> {
+	@Autowired
+	private IClockInConfService clockInConfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param clockInConf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "clock_in_conf-分页列表查询")
+	@ApiOperation(value="clock_in_conf-分页列表查询", notes="clock_in_conf-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ClockInConf>> queryPageList(ClockInConf clockInConf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ClockInConf> queryWrapper = QueryGenerator.initQueryWrapper(clockInConf, req.getParameterMap());
+		Page<ClockInConf> page = new Page<ClockInConf>(pageNo, pageSize);
+		IPage<ClockInConf> pageList = clockInConfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param clockInConf
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_conf-添加")
+	@ApiOperation(value="clock_in_conf-添加", notes="clock_in_conf-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ClockInConf clockInConf) {
+		clockInConfService.save(clockInConf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param clockInConf
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_conf-编辑")
+	@ApiOperation(value="clock_in_conf-编辑", notes="clock_in_conf-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ClockInConf clockInConf) {
+		clockInConfService.updateById(clockInConf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_conf-通过id删除")
+	@ApiOperation(value="clock_in_conf-通过id删除", notes="clock_in_conf-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		clockInConfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_conf-批量删除")
+	@ApiOperation(value="clock_in_conf-批量删除", notes="clock_in_conf-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.clockInConfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "clock_in_conf-通过id查询")
+	@ApiOperation(value="clock_in_conf-通过id查询", notes="clock_in_conf-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ClockInConf> queryById(@RequestParam(name="id",required=true) String id) {
+		ClockInConf clockInConf = clockInConfService.getById(id);
+		if(clockInConf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(clockInConf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param clockInConf
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ClockInConf clockInConf) {
+        return super.exportXls(request, clockInConf, ClockInConf.class, "clock_in_conf");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ClockInConf.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/entity/ClockInConf.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.clockinconf.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: clock_in_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-11-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("clock_in_conf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="clock_in_conf对象", description="clock_in_conf")
+public class ClockInConf implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**健名*/
+	@Excel(name = "健名", width = 15)
+    @ApiModelProperty(value = "健名")
+    private java.lang.String name;
+	/**值*/
+	@Excel(name = "值", width = 15)
+    @ApiModelProperty(value = "值")
+    private java.lang.String value;
+	/**说明*/
+	@Excel(name = "说明", width = 15)
+    @ApiModelProperty(value = "说明")
+    private java.lang.String info;
+	/**是否删除*/
+	@Excel(name = "是否删除", width = 15, dicCode = "is_delete")
+	@Dict(dicCode = "is_delete")
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.Integer delFlag;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/ClockInConfMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.clockinconf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.clockinconf.entity.ClockInConf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: clock_in_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-11-18
+ * @Version: V1.0
+ */
+public interface ClockInConfMapper extends BaseMapper<ClockInConf> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/xml/ClockInConfMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.clockinconf.mapper.ClockInConfMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/IClockInConfService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.clockinconf.service;
+
+import org.jeecg.modules.clockinconf.entity.ClockInConf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: clock_in_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-11-18
+ * @Version: V1.0
+ */
+public interface IClockInConfService extends IService<ClockInConf> {
+
+    String getConf(String name);
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/impl/ClockInConfServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.clockinconf.service.impl;
+
+import org.jeecg.modules.clockinconf.entity.ClockInConf;
+import org.jeecg.modules.clockinconf.mapper.ClockInConfMapper;
+import org.jeecg.modules.clockinconf.service.IClockInConfService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: clock_in_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-11-18
+ * @Version: V1.0
+ */
+@Service
+public class ClockInConfServiceImpl extends ServiceImpl<ClockInConfMapper, ClockInConf> implements IClockInConfService {
+
+    @Override
+    public String getConf(String name) {
+        ClockInConf clockInConf = this.lambdaQuery()
+                .eq(ClockInConf::getDelFlag, 0)
+                .eq(ClockInConf::getName, name)
+                .one();
+        return clockInConf.getValue();
+    }
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/ClockInConfList.vue

@@ -0,0 +1,195 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+<!--    <div class="table-page-search-wrapper">-->
+<!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+<!--        <a-row :gutter="24">-->
+<!--        </a-row>-->
+<!--      </a-form>-->
+<!--    </div>-->
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_conf')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <template slot="textSlot" slot-scope="text">
+          <j-ellipsis :value="text"></j-ellipsis>
+        </template>
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <clock-in-conf-modal ref="modalForm" @ok="modalFormOk"></clock-in-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ClockInConfModal from './modules/ClockInConfModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ClockInConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ClockInConfModal
+    },
+    data () {
+      return {
+        description: 'clock_in_conf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'健名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'值',
+            align:"center",
+            dataIndex: 'value',
+            scopedSlots: {customRender: 'textSlot'}
+          },
+          {
+            title:'说明',
+            align:"center",
+            dataIndex: 'info',
+            scopedSlots: {customRender: 'textSlot'}
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/clockinconf/clockInConf/list",
+          delete: "/clockinconf/clockInConf/delete",
+          deleteBatch: "/clockinconf/clockInConf/deleteBatch",
+          exportXlsUrl: "/clockinconf/clockInConf/exportXls",
+          importExcelUrl: "clockinconf/clockInConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'健名',dictCode:''})
+        fieldList.push({type:'string',value:'value',text:'值',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'说明',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfForm.vue

@@ -0,0 +1,123 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="健名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入健名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <a-textarea v-model="model.value" rows="4" placeholder="请输入值" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-textarea v-model="model.info" rows="4" placeholder="请输入说明" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ClockInConfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           delFlag: [
+              { required: true, message: '请输入是否删除!'},
+           ],
+        },
+        url: {
+          add: "/clockinconf/clockInConf/add",
+          edit: "/clockinconf/clockInConf/edit",
+          queryById: "/clockinconf/clockInConf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-conf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ClockInConfForm from './ClockInConfForm'
+
+  export default {
+    name: 'ClockInConfModal',
+    components: {
+      ClockInConfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ClockInConfForm from './ClockInConfForm'
+  export default {
+    name: 'ClockInConfModal',
+    components: {
+      ClockInConfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/clockinconf/clockInConf/list',
+  save='/clockinconf/clockInConf/add',
+  edit='/clockinconf/clockInConf/edit',
+  deleteOne = '/clockinconf/clockInConf/delete',
+  deleteBatch = '/clockinconf/clockInConf/deleteBatch',
+  importExcel = '/clockinconf/clockInConf/importExcel',
+  exportXls = '/clockinconf/clockInConf/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.data.ts

@@ -0,0 +1,61 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '健名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '值',
+    align:"center",
+    dataIndex: 'value'
+   },
+   {
+    title: '说明',
+    align:"center",
+    dataIndex: 'info'
+   },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'delFlag_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '健名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '值',
+    field: 'value',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '说明',
+    field: 'info',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '是否删除',
+    field: 'delFlag',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_delete"
+     },
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入是否删除!'},
+          ];
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConfList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ClockInConfModal @register="registerModal" @success="handleSuccess"></ClockInConfModal>
+  </div>
+</template>
+
+<script lang="ts" name="clockinconf-clockInConf" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ClockInConfModal from './components/ClockInConfModal.vue'
+  import {columns, searchFormSchema} from './clockInConf.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './clockInConf.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'clock_in_conf',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"clock_in_conf",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/components/ClockInConfModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../clockInConf.data';
+    import {saveOrUpdate} from '../clockInConf.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java

@@ -9,8 +9,12 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.clockinlog.entity.ClockinLog;
 import org.jeecg.modules.clockinlog.service.IClockinLogService;
@@ -27,6 +31,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -49,7 +54,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ClockinLogController extends JeecgController<ClockinLog, IClockinLogService> {
 	@Autowired
 	private IClockinLogService clockinLogService;
-	
+	 @Value("${jeecg.path.upload}")
+	 private String upLoadPath;
 	/**
 	 * 分页列表查询
 	 *
@@ -153,9 +159,50 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ClockinLog clockinLog) {
-        return super.exportXls(request, clockinLog, ClockinLog.class, "clockin_log");
+        return this.exportXls(request, clockinLog, ClockinLog.class, "clockin_log");
     }
 
+	 protected ModelAndView exportXls(HttpServletRequest request, ClockinLog object, Class<ClockinLog> clazz, String title) {
+		 // Step.1 组装查询条件
+		 QueryWrapper<ClockinLog> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		 // Step.2 获取导出数据
+		 List<ClockinLog> pageList = service.list(queryWrapper);
+		 List<ClockinLog> exportList = null;
+
+		 // 过滤选中数据
+		 String selections = request.getParameter("selections");
+		 if (oConvertUtils.isNotEmpty(selections)) {
+			 List<String> selectionList = Arrays.asList(selections.split(","));
+			 exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
+		 } else {
+			 exportList = pageList;
+		 }
+
+		 // Step.3 AutoPoi 导出Excel
+		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		 //此处设置的filename无效 ,前端会重更新设置一下
+		 mv.addObject(NormalExcelConstants.FILE_NAME, title);
+		 mv.addObject(NormalExcelConstants.CLASS, clazz);
+		 //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+		 ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+		 exportParams.setImageBasePath(upLoadPath);
+		 //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+		 mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+		 mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+		 return mv;
+	 }
+
+	 private String getId(ClockinLog item) {
+		 try {
+			 return PropertyUtils.getProperty(item, "id").toString();
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 return null;
+		 }
+	 }
+
     /**
       * 通过excel导入数据
     *

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/auth/service/impl/AuthServiceImpl.java

@@ -1,5 +1,13 @@
 package org.jeecg.modules.xcx.auth.service.impl;
 
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.common.profile.ClientProfile;
+import com.tencentcloudapi.common.profile.HttpProfile;
+import com.tencentcloudapi.faceid.v20180301.FaceidClient;
+import com.tencentcloudapi.faceid.v20180301.models.IdCardVerificationRequest;
+import com.tencentcloudapi.faceid.v20180301.models.IdCardVerificationResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
@@ -10,10 +18,12 @@ import org.jeecg.modules.clockinauth.service.IClockinAuthService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.xcx.auth.req.ApplyAuthReq;
 import org.jeecg.modules.xcx.auth.service.IAuthService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-
+@Slf4j
 @Service
 public class AuthServiceImpl implements IAuthService {
 
@@ -21,7 +31,14 @@ public class AuthServiceImpl implements IAuthService {
     private IClockinAuthService clockinAuthService;
     @Resource
     private ShiroRealm shiroRealm;
+    @Value("${tencent.cloud.secretId}")
+    private String secretId;
+    @Value("${tencent.cloud.secretKey}")
+    private String secretKey;
+    @Value("${tencent.cloud.endpoint}")
+    private String endpoint;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Result<?> applyAuth(ApplyAuthReq applyAuthReq) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(applyAuthReq.getToken());
@@ -31,13 +48,45 @@ public class AuthServiceImpl implements IAuthService {
         if(StringUtils.isBlank(applyAuthReq.getCardNo())){
             throw new JeecgBootException("请填写身份证");
         }
+        ClockinAuth clockinAuth1 = clockinAuthService.lambdaQuery()
+                .eq(ClockinAuth::getDelFlag, 0)
+                .eq(ClockinAuth::getUserId, hanHaiMember.getId())
+                .in(ClockinAuth::getStatus, 0, 1)
+                .one();
+
+        if(clockinAuth1 != null){
+            throw new JeecgBootException("已提交过实名认证，请勿重复提交");
+        }
+
         ClockinAuth clockinAuth = new ClockinAuth();
         clockinAuth.setUserId(hanHaiMember.getId());
         clockinAuth.setName(applyAuthReq.getName());
         clockinAuth.setCardNo(applyAuthReq.getCardNo());
         clockinAuth.setPic(applyAuthReq.getPic());
+        clockinAuth.setStatus(1);
+        IdCardVerificationRequest req = new IdCardVerificationRequest();
+        req.setName(clockinAuth.getName());
+        req.setIdCard(clockinAuth.getCardNo());
+        try {
+            Credential cred = new Credential(secretId, secretKey);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint(endpoint);
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            FaceidClient faceidClient = new FaceidClient(cred,"",clientProfile);
+            IdCardVerificationResponse resp = faceidClient.IdCardVerification(req);
+            if(!StringUtils.equals(resp.getResult(),"0")){
+                throw new JeecgBootException(resp.getDescription());
+            }
+        }catch (TencentCloudSDKException e){
+            log.error(e.toString());
+            throw new JeecgBootException("实名制失败");
+        }
+
         clockinAuthService.save(clockinAuth);
-//        TencentUtils.createPerson(clockinAuth);
+
+
+        TencentUtils.createPerson(clockinAuth);
         return Result.OK();
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/req/ClockInReq.java

@@ -19,5 +19,7 @@ public class ClockInReq {
     /**纬度*/
     @ApiModelProperty(value = "纬度")
     private String lat;
+    /**人脸*/
+    private String image;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/impl/ClockinServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.xcx.clockin.service.impl;
 
+import com.tencentcloudapi.iai.v20180301.models.VerifyFaceResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
@@ -10,6 +11,7 @@ import org.jeecg.modules.clockInproject.entity.ClockInProject;
 import org.jeecg.modules.clockInproject.service.IClockInProjectService;
 import org.jeecg.modules.clockInprojectitem.entity.ClockInProjectItem;
 import org.jeecg.modules.clockInprojectitem.service.IClockInProjectItemService;
+import org.jeecg.modules.clockinconf.service.IClockInConfService;
 import org.jeecg.modules.clockinlog.entity.ClockinLog;
 import org.jeecg.modules.clockinlog.ressp.ClockInLogResp;
 import org.jeecg.modules.clockinlog.service.IClockinLogService;
@@ -24,6 +26,7 @@ import org.jeecg.modules.xcx.clockin.req.ClockInTotalReq;
 import org.jeecg.modules.xcx.clockin.resp.ClockInTotalResp;
 import org.jeecg.modules.xcx.clockin.service.IClockinService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -42,7 +45,10 @@ public class ClockinServiceImpl implements IClockinService {
     private IClockInProjectItemService clockInProjectItemService;
     @Resource
     private IClockinTeamLogService clockinTeamLogService;
+    @Resource
+    private IClockInConfService clockInConfService;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Result<?> clockIn(ClockInReq clockInReq) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(clockInReq.getToken());
@@ -69,7 +75,10 @@ public class ClockinServiceImpl implements IClockinService {
             throw new JeecgBootException("当前未到打卡时间");
         }
 
-//        TencentUtils.VerifyFace(hanHaiMember.getId());
+        VerifyFaceResponse verifyFaceResponse = TencentUtils.VerifyFace(hanHaiMember.getId(), clockInReq.getImage(),Long.parseLong(clockInConfService.getConf("qualityControl")));
+        if(!verifyFaceResponse.getIsMatch()){
+            throw new JeecgBootException("人脸识别错误");
+        }
 
         ClockinLog clockinLog1 = clockinLogService.lambdaQuery()
                 .eq(ClockinLog::getDelFlag, 0)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java

@@ -48,6 +48,7 @@ public class UserServiceImpl implements IUserService {
         }
         ClockinAuth clockinAuth = clockinAuthService.lambdaQuery()
                 .eq(ClockinAuth::getDelFlag, 0)
+                .in(ClockinAuth::getStatus,0,1)
                 .eq(ClockinAuth::getUserId, hanHaiMember.getId())
                 .one();
         hanHaiMember.setAuth(clockinAuth);

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -343,3 +343,5 @@ tencent:
     face:
       groupName: test
       region: ap-beijing
+    endpoint: faceid.tencentcloudapi.com
+

jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -343,3 +343,4 @@ tencent:
     face:
       groupName: test
       region: ap-beijing
+    endpoint: faceid.tencentcloudapi.com